FileWrapper[Impl] modifications and actually remove the "Impl" class.

webrtc/system_wrappers/source/trace_impl.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 23 matching lines @@
 // 25.6 Mbyte
 
 class TraceImpl : public Trace {
  public:
   virtual ~TraceImpl();
 
   static TraceImpl* CreateInstance();
   static TraceImpl* GetTrace(const TraceLevel level = kTraceAll);
 
   int32_t SetTraceFileImpl(const char* file_name, const bool add_file_counter);
-  int32_t TraceFileImpl(char file_name[FileWrapper::kMaxFileNameSize]);
-
   int32_t SetTraceCallbackImpl(TraceCallback* callback);
 
   void AddImpl(const TraceLevel level, const TraceModule module,
                const int32_t id, const char* msg);
 
   bool TraceCheck(const TraceLevel level) const;
 
  protected:
   TraceImpl();
 
@@ skipping 19 matching lines @@
   int32_t AddMessage(char* trace_message,
                      const char msg[WEBRTC_TRACE_MAX_MESSAGE_SIZE],
                      const uint16_t written_so_far) const;
 
   void AddMessageToList(
     const char trace_message[WEBRTC_TRACE_MAX_MESSAGE_SIZE],
     const uint16_t length,
     const TraceLevel level);
 
   bool UpdateFileName(
-    const char file_name_utf8[FileWrapper::kMaxFileNameSize],
-    char file_name_with_counter_utf8[FileWrapper::kMaxFileNameSize],
-    const uint32_t new_count) const;
+      char file_name_with_counter_utf8[FileWrapper::kMaxFileNameSize],
+      const uint32_t new_count) const EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   bool CreateFileName(
     const char file_name_utf8[FileWrapper::kMaxFileNameSize],
     char file_name_with_counter_utf8[FileWrapper::kMaxFileNameSize],
     const uint32_t new_count) const;
 
   void WriteToFile(const char* msg, uint16_t length)
       EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   TraceCallback* callback_ GUARDED_BY(crit_);
   uint32_t row_count_text_ GUARDED_BY(crit_);
   uint32_t file_count_text_ GUARDED_BY(crit_);
 
   const std::unique_ptr<FileWrapper> trace_file_ GUARDED_BY(crit_);
+  std::string trace_file_path_ GUARDED_BY(crit_);
   rtc::CriticalSection crit_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_SYSTEM_WRAPPERS_SOURCE_TRACE_IMPL_H_