[fsp] Remove weak pointers from loggers wherever possible.

chrome/browser/chromeos/file_system_provider/operations/read_directory_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/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 56 matching lines @@
     bool has_more() { return has_more_; }
 
    private:
     base::File::Error result_;
     fileapi::AsyncFileUtil::EntryList entry_list_;
     bool has_more_;
 
     DISALLOW_COPY_AND_ASSIGN(Event);
   };
 
-  CallbackLogger() : weak_ptr_factory_(this) {}
+  CallbackLogger() {}
   virtual ~CallbackLogger() {}
 
   void OnReadDirectory(base::File::Error result,
                        const fileapi::AsyncFileUtil::EntryList& entry_list,
                        bool has_more) {
     events_.push_back(new Event(result, entry_list, has_more));
   }
 
   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 FileSystemProviderOperationsReadDirectoryTest : public testing::Test {
  protected:
   FileSystemProviderOperationsReadDirectoryTest() {}
   virtual ~FileSystemProviderOperationsReadDirectoryTest() {}
@@ skipping 10 matching lines @@
 };
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, Execute) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadDirectory read_directory(NULL,
                                file_system_info_,
                                base::FilePath::FromUTF8Unsafe(kDirectoryPath),
                                base::Bind(&CallbackLogger::OnReadDirectory,
-                                          callback_logger.GetWeakPtr()));
+                                          base::Unretained(&callback_logger)));
   read_directory.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_directory.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(extensions::api::file_system_provider::OnReadDirectoryRequested::
                 kEventName,
@@ skipping 18 matching lines @@
 }
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadDirectory read_directory(NULL,
                                file_system_info_,
                                base::FilePath::FromUTF8Unsafe(kDirectoryPath),
                                base::Bind(&CallbackLogger::OnReadDirectory,
-                                          callback_logger.GetWeakPtr()));
+                                          base::Unretained(&callback_logger)));
   read_directory.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(read_directory.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, OnSuccess) {
   using extensions::api::file_system_provider_internal::
       ReadDirectoryRequestedSuccess::Params;
 
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadDirectory read_directory(NULL,
                                file_system_info_,
                                base::FilePath::FromUTF8Unsafe(kDirectoryPath),
                                base::Bind(&CallbackLogger::OnReadDirectory,
-                                          callback_logger.GetWeakPtr()));
+                                          base::Unretained(&callback_logger)));
   read_directory.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_directory.Execute(kRequestId));
 
   // Sample input as JSON. Keep in sync with file_system_provider_api.idl.
   // As for now, it is impossible to create *::Params class directly, not from
   // base::Value.
   const std::string input =
@@ skipping 47 matching lines @@
 }
 
 TEST_F(FileSystemProviderOperationsReadDirectoryTest, OnError) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
   ReadDirectory read_directory(NULL,
                                file_system_info_,
                                base::FilePath::FromUTF8Unsafe(kDirectoryPath),
                                base::Bind(&CallbackLogger::OnReadDirectory,
-                                          callback_logger.GetWeakPtr()));
+                                          base::Unretained(&callback_logger)));
   read_directory.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(read_directory.Execute(kRequestId));
 
   read_directory.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(0u, event->entry_list().size());
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos