Index: chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc |
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc |
index 7fff9914de8e64f766918fc449f85404b6627916..ef5f1708cd54a995a54be9ec5a6ce87b86d627d1 100644 |
--- a/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc |
+++ b/chrome/browser/chromeos/file_system_provider/operations/get_metadata_unittest.cc |
@@ -69,7 +69,7 @@ class CallbackLogger { |
DISALLOW_COPY_AND_ASSIGN(Event); |
}; |
- CallbackLogger() : weak_ptr_factory_(this) {} |
+ CallbackLogger() {} |
virtual ~CallbackLogger() {} |
void OnGetMetadata(const EntryMetadata& metadata, base::File::Error result) { |
@@ -78,14 +78,9 @@ class CallbackLogger { |
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); |
}; |
@@ -112,11 +107,11 @@ 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))); |
@@ -151,11 +146,11 @@ 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))); |
@@ -170,11 +165,11 @@ TEST_F(FileSystemProviderOperationsGetMetadataTest, OnSuccess) { |
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))); |
@@ -235,11 +230,11 @@ 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))); |