[fsp] Remove weak pointers from loggers wherever possible.

chrome/browser/chromeos/file_system_provider/operations/open_file_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 50 matching lines @@
     int file_handle() { return file_handle_; }
     base::File::Error result() { return result_; }
 
    private:
     int file_handle_;
     base::File::Error result_;
 
     DISALLOW_COPY_AND_ASSIGN(Event);
   };
 
-  CallbackLogger() : weak_ptr_factory_(this) {}
+  CallbackLogger() {}
   virtual ~CallbackLogger() {}
 
   void OnOpenFile(int file_handle, base::File::Error result) {
     events_.push_back(new Event(file_handle, result));
   }
 
   ScopedVector<Event>& events() { return events_; }
 
-  base::WeakPtr<CallbackLogger> GetWeakPtr() {
-    return weak_ptr_factory_.GetWeakPtr();
-  }
-
  private:
   ScopedVector<Event> events_;
   bool dispatch_reply_;
-  base::WeakPtrFactory<CallbackLogger> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CallbackLogger);
 };
 
 }  // namespace
 
 class FileSystemProviderOperationsOpenFileTest : public testing::Test {
  protected:
   FileSystemProviderOperationsOpenFileTest() {}
   virtual ~FileSystemProviderOperationsOpenFileTest() {}
 
   virtual void SetUp() OVERRIDE {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
                                "" /* file_system_name */,
                                base::FilePath() /* mount_path */);
   }
 
   ProvidedFileSystemInfo file_system_info_;
 };
 
 TEST_F(FileSystemProviderOperationsOpenFileTest, Execute) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  OpenFile open_file(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kFilePath),
-      ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
-      false /* create */,
-      base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
+  OpenFile open_file(NULL,
+                     file_system_info_,
+                     base::FilePath::FromUTF8Unsafe(kFilePath),
+                     ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
+                     false /* create */,
+                     base::Bind(&CallbackLogger::OnOpenFile,
+                                base::Unretained(&callback_logger)));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(open_file.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnOpenFileRequested::kEventName,
@@ skipping 25 matching lines @@
 
   bool event_create;
   EXPECT_TRUE(options->GetBoolean("create", &event_create));
   EXPECT_FALSE(event_create);
 }
 
 TEST_F(FileSystemProviderOperationsOpenFileTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  OpenFile open_file(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kFilePath),
-      ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
-      false /* create */,
-      base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
+  OpenFile open_file(NULL,
+                     file_system_info_,
+                     base::FilePath::FromUTF8Unsafe(kFilePath),
+                     ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
+                     false /* create */,
+                     base::Bind(&CallbackLogger::OnOpenFile,
+                                base::Unretained(&callback_logger)));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(open_file.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsOpenFileTest, OnSuccess) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  OpenFile open_file(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kFilePath),
-      ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
-      false /* create */,
-      base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
+  OpenFile open_file(NULL,
+                     file_system_info_,
+                     base::FilePath::FromUTF8Unsafe(kFilePath),
+                     ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
+                     false /* create */,
+                     base::Bind(&CallbackLogger::OnOpenFile,
+                                base::Unretained(&callback_logger)));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(open_file.Execute(kRequestId));
 
   open_file.OnSuccess(kRequestId,
                       scoped_ptr<RequestValue>(new RequestValue()),
                       false /* has_more */);
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_OK, event->result());
   EXPECT_LT(0, event->file_handle());
 }
 
 TEST_F(FileSystemProviderOperationsOpenFileTest, OnError) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  OpenFile open_file(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kFilePath),
-      ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
-      false /* create */,
-      base::Bind(&CallbackLogger::OnOpenFile, callback_logger.GetWeakPtr()));
+  OpenFile open_file(NULL,
+                     file_system_info_,
+                     base::FilePath::FromUTF8Unsafe(kFilePath),
+                     ProvidedFileSystemInterface::OPEN_FILE_MODE_READ,
+                     false /* create */,
+                     base::Bind(&CallbackLogger::OnOpenFile,
+                                base::Unretained(&callback_logger)));
   open_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(open_file.Execute(kRequestId));
 
   open_file.OnError(kRequestId,
                     scoped_ptr<RequestValue>(new RequestValue()),
                     base::File::FILE_ERROR_TOO_MANY_OPENED);
   ASSERT_EQ(1u, callback_logger.events().size());
   CallbackLogger::Event* event = callback_logger.events()[0];
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, event->result());
   ASSERT_EQ(0, event->file_handle());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos