[fsp] Remove weak pointers from loggers wherever possible.

chrome/browser/chromeos/file_system_provider/operations/read_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 "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 55 matching lines @@
     base::File::Error result() const { return result_; }
 
    private:
     int chunk_length_;
     bool has_more_;
     base::File::Error result_;
 
     DISALLOW_COPY_AND_ASSIGN(Event);
   };
 
-  CallbackLogger() : weak_ptr_factory_(this) {}
+  CallbackLogger() {}
   virtual ~CallbackLogger() {}
 
   void OnReadFile(int chunk_length, bool has_more, base::File::Error result) {
     events_.push_back(new Event(chunk_length, has_more, 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 FileSystemProviderOperationsReadFileTest : public testing::Test {
  protected:
   FileSystemProviderOperationsReadFileTest() {}
   virtual ~FileSystemProviderOperationsReadFileTest() {}
 
   virtual void SetUp() OVERRIDE {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
                                "" /* file_system_name */,
                                base::FilePath() /* mount_path */);
     io_buffer_ = make_scoped_refptr(new net::IOBuffer(kOffset + kLength));
   }
 
   ProvidedFileSystemInfo file_system_info_;
   scoped_refptr<net::IOBuffer> io_buffer_;
 };
 
 TEST_F(FileSystemProviderOperationsReadFileTest, Execute) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  ReadFile read_file(
-      NULL,
-      file_system_info_,
-      kFileHandle,
-      io_buffer_.get(),
-      kOffset,
-      kLength,
-      base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+  ReadFile read_file(NULL,
+                     file_system_info_,
+                     kFileHandle,
+                     io_buffer_.get(),
+                     kOffset,
+                     kLength,
+                     base::Bind(&CallbackLogger::OnReadFile,
+                                base::Unretained(&callback_logger)));
   read_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_file.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnReadFileRequested::kEventName,
@@ skipping 22 matching lines @@
 
   int event_length = -1;
   EXPECT_TRUE(options->GetInteger("length", &event_length));
   EXPECT_EQ(kLength, event_length);
 }
 
 TEST_F(FileSystemProviderOperationsReadFileTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  ReadFile read_file(
-      NULL,
-      file_system_info_,
-      kFileHandle,
-      io_buffer_.get(),
-      kOffset,
-      kLength,
-      base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+  ReadFile read_file(NULL,
+                     file_system_info_,
+                     kFileHandle,
+                     io_buffer_.get(),
+                     kOffset,
+                     kLength,
+                     base::Bind(&CallbackLogger::OnReadFile,
+                                base::Unretained(&callback_logger)));
   read_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(read_file.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsReadFileTest, OnSuccess) {
   using extensions::api::file_system_provider_internal::
       ReadFileRequestedSuccess::Params;
 
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  ReadFile read_file(
-      NULL,
-      file_system_info_,
-      kFileHandle,
-      io_buffer_.get(),
-      kOffset,
-      kLength,
-      base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+  ReadFile read_file(NULL,
+                     file_system_info_,
+                     kFileHandle,
+                     io_buffer_.get(),
+                     kOffset,
+                     kLength,
+                     base::Bind(&CallbackLogger::OnReadFile,
+                                base::Unretained(&callback_logger)));
   read_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_file.Execute(kRequestId));
 
   const std::string data = "ABCDE";
   const bool has_more = false;
   const int execution_time = 0;
 
@@ skipping 18 matching lines @@
   EXPECT_EQ(kLength, event->chunk_length());
   EXPECT_FALSE(event->has_more());
   EXPECT_EQ(data, std::string(io_buffer_->data(), kLength));
   EXPECT_EQ(base::File::FILE_OK, event->result());
 }
 
 TEST_F(FileSystemProviderOperationsReadFileTest, OnError) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  ReadFile read_file(
-      NULL,
-      file_system_info_,
-      kFileHandle,
-      io_buffer_.get(),
-      kOffset,
-      kLength,
-      base::Bind(&CallbackLogger::OnReadFile, callback_logger.GetWeakPtr()));
+  ReadFile read_file(NULL,
+                     file_system_info_,
+                     kFileHandle,
+                     io_buffer_.get(),
+                     kOffset,
+                     kLength,
+                     base::Bind(&CallbackLogger::OnReadFile,
+                                base::Unretained(&callback_logger)));
   read_file.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_file.Execute(kRequestId));
 
   read_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());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos