[fsp] Remove weak pointers from loggers wherever possible.

chrome/browser/chromeos/file_system_provider/operations/close_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 34 matching lines @@
  private:
   ScopedVector<extensions::Event> events_;
   bool dispatch_reply_;
 
   DISALLOW_COPY_AND_ASSIGN(LoggingDispatchEventImpl);
 };
 
 // Callback invocation logger. Acts as a fileapi end-point.
 class CallbackLogger {
  public:
-  CallbackLogger() : weak_ptr_factory_(this) {}
+  CallbackLogger() {}
   virtual ~CallbackLogger() {}
 
   void OnCloseFile(base::File::Error result) { events_.push_back(result); }
 
   std::vector<base::File::Error>& events() { return events_; }
 
-  base::WeakPtr<CallbackLogger> GetWeakPtr() {
-    return weak_ptr_factory_.GetWeakPtr();
-  }
-
  private:
   std::vector<base::File::Error> events_;
-  base::WeakPtrFactory<CallbackLogger> weak_ptr_factory_;
-
   DISALLOW_COPY_AND_ASSIGN(CallbackLogger);
 };
 
 }  // namespace
 
 class FileSystemProviderOperationsCloseFileTest : public testing::Test {
  protected:
   FileSystemProviderOperationsCloseFileTest() {}
   virtual ~FileSystemProviderOperationsCloseFileTest() {}
 
   virtual void SetUp() OVERRIDE {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
                                "" /* file_system_name */,
                                base::FilePath() /* mount_path */);
   }
 
   ProvidedFileSystemInfo file_system_info_;
 };
 
 TEST_F(FileSystemProviderOperationsCloseFileTest, Execute) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  CloseFile close_file(
-      NULL,
-      file_system_info_,
-      kOpenRequestId,
-      base::Bind(&CallbackLogger::OnCloseFile, callback_logger.GetWeakPtr()));
+  CloseFile close_file(NULL,
+                       file_system_info_,
+                       kOpenRequestId,
+                       base::Bind(&CallbackLogger::OnCloseFile,
+                                  base::Unretained(&callback_logger)));
   close_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(close_file.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnCloseFileRequested::kEventName,
@@ skipping 14 matching lines @@
 
   int event_open_request_id = -1;
   EXPECT_TRUE(options->GetInteger("openRequestId", &event_open_request_id));
   EXPECT_EQ(kOpenRequestId, event_open_request_id);
 }
 
 TEST_F(FileSystemProviderOperationsCloseFileTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  CloseFile close_file(
-      NULL,
-      file_system_info_,
-      kOpenRequestId,
-      base::Bind(&CallbackLogger::OnCloseFile, callback_logger.GetWeakPtr()));
+  CloseFile close_file(NULL,
+                       file_system_info_,
+                       kOpenRequestId,
+                       base::Bind(&CallbackLogger::OnCloseFile,
+                                  base::Unretained(&callback_logger)));
   close_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(close_file.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsCloseFileTest, OnSuccess) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  CloseFile close_file(
-      NULL,
-      file_system_info_,
-      kOpenRequestId,
-      base::Bind(&CallbackLogger::OnCloseFile, callback_logger.GetWeakPtr()));
+  CloseFile close_file(NULL,
+                       file_system_info_,
+                       kOpenRequestId,
+                       base::Bind(&CallbackLogger::OnCloseFile,
+                                  base::Unretained(&callback_logger)));
   close_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(close_file.Execute(kRequestId));
 
   close_file.OnSuccess(kRequestId,
                        scoped_ptr<RequestValue>(new RequestValue()),
                        false /* has_more */);
   ASSERT_EQ(1u, callback_logger.events().size());
   EXPECT_EQ(base::File::FILE_OK, callback_logger.events()[0]);
 }
 
 TEST_F(FileSystemProviderOperationsCloseFileTest, OnError) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  CloseFile close_file(
-      NULL,
-      file_system_info_,
-      kOpenRequestId,
-      base::Bind(&CallbackLogger::OnCloseFile, callback_logger.GetWeakPtr()));
+  CloseFile close_file(NULL,
+                       file_system_info_,
+                       kOpenRequestId,
+                       base::Bind(&CallbackLogger::OnCloseFile,
+                                  base::Unretained(&callback_logger)));
   close_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(close_file.Execute(kRequestId));
 
   close_file.OnError(kRequestId,
                      scoped_ptr<RequestValue>(new RequestValue()),
                      base::File::FILE_ERROR_TOO_MANY_OPENED);
   ASSERT_EQ(1u, callback_logger.events().size());
   EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED,
             callback_logger.events()[0]);
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos