[fsp] Remove weak pointers from loggers wherever possible.

chrome/browser/chromeos/file_system_provider/operations/get_metadata_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 51 matching lines @@
     const EntryMetadata& metadata() { return metadata_; }
     base::File::Error result() { return result_; }
 
    private:
     EntryMetadata metadata_;
     base::File::Error result_;
 
     DISALLOW_COPY_AND_ASSIGN(Event);
   };
 
-  CallbackLogger() : weak_ptr_factory_(this) {}
+  CallbackLogger() {}
   virtual ~CallbackLogger() {}
 
   void OnGetMetadata(const EntryMetadata& metadata, base::File::Error result) {
     events_.push_back(new Event(metadata, 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 FileSystemProviderOperationsGetMetadataTest : public testing::Test {
  protected:
   FileSystemProviderOperationsGetMetadataTest() {}
   virtual ~FileSystemProviderOperationsGetMetadataTest() {}
 
   virtual void SetUp() OVERRIDE {
     file_system_info_ =
         ProvidedFileSystemInfo(kExtensionId,
                                kFileSystemId,
                                "" /* file_system_name */,
                                base::FilePath() /* mount_path */);
   }
 
   ProvidedFileSystemInfo file_system_info_;
 };
 
 TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  GetMetadata get_metadata(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kDirectoryPath),
-      base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
+  GetMetadata get_metadata(NULL,
+                           file_system_info_,
+                           base::FilePath::FromUTF8Unsafe(kDirectoryPath),
+                           base::Bind(&CallbackLogger::OnGetMetadata,
+                                      base::Unretained(&callback_logger)));
   get_metadata.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(get_metadata.Execute(kRequestId));
 
   ASSERT_EQ(1u, dispatcher.events().size());
   extensions::Event* event = dispatcher.events()[0];
   EXPECT_EQ(
       extensions::api::file_system_provider::OnGetMetadataRequested::kEventName,
@@ skipping 14 matching lines @@
 
   std::string event_entry_path;
   EXPECT_TRUE(options->GetString("entryPath", &event_entry_path));
   EXPECT_EQ(kDirectoryPath, event_entry_path);
 }
 
 TEST_F(FileSystemProviderOperationsGetMetadataTest, Execute_NoListener) {
   LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  GetMetadata get_metadata(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kDirectoryPath),
-      base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
+  GetMetadata get_metadata(NULL,
+                           file_system_info_,
+                           base::FilePath::FromUTF8Unsafe(kDirectoryPath),
+                           base::Bind(&CallbackLogger::OnGetMetadata,
+                                      base::Unretained(&callback_logger)));
   get_metadata.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(get_metadata.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) {
   using extensions::api::file_system_provider_internal::
       GetMetadataRequestedSuccess::Params;
 
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  GetMetadata get_metadata(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kDirectoryPath),
-      base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
+  GetMetadata get_metadata(NULL,
+                           file_system_info_,
+                           base::FilePath::FromUTF8Unsafe(kDirectoryPath),
+                           base::Bind(&CallbackLogger::OnGetMetadata,
+                                      base::Unretained(&callback_logger)));
   get_metadata.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(get_metadata.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 40 matching lines @@
   EXPECT_TRUE(
       base::Time::FromString("Thu Apr 24 00:46:52 UTC 2014", &expected_time));
   EXPECT_EQ(expected_time, metadata.modification_time);
   EXPECT_EQ(kMimeType, metadata.mime_type);
 }
 
 TEST_F(FileSystemProviderOperationsGetMetadataTest, OnError) {
   LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   CallbackLogger callback_logger;
 
-  GetMetadata get_metadata(
-      NULL,
-      file_system_info_,
-      base::FilePath::FromUTF8Unsafe(kDirectoryPath),
-      base::Bind(&CallbackLogger::OnGetMetadata, callback_logger.GetWeakPtr()));
+  GetMetadata get_metadata(NULL,
+                           file_system_info_,
+                           base::FilePath::FromUTF8Unsafe(kDirectoryPath),
+                           base::Bind(&CallbackLogger::OnGetMetadata,
+                                      base::Unretained(&callback_logger)));
   get_metadata.SetDispatchEventImplForTesting(
       base::Bind(&LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(get_metadata.Execute(kRequestId));
 
   get_metadata.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