| Index: chrome/browser/chromeos/file_system_provider/operations/unobserve_entry_unittest.cc | 
| diff --git a/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/unobserve_entry_unittest.cc | 
| similarity index 64% | 
| copy from chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc | 
| copy to chrome/browser/chromeos/file_system_provider/operations/unobserve_entry_unittest.cc | 
| index 0fc8ce79e667c12068f17cf380a5988992a7e891..a14e66b9115e05809805391991548608b98df066 100644 | 
| --- a/chrome/browser/chromeos/file_system_provider/operations/create_directory_unittest.cc | 
| +++ b/chrome/browser/chromeos/file_system_provider/operations/unobserve_entry_unittest.cc | 
| @@ -2,7 +2,7 @@ | 
| // Use of this source code is governed by a BSD-style license that can be | 
| // found in the LICENSE file. | 
|  | 
| -#include "chrome/browser/chromeos/file_system_provider/operations/create_directory.h" | 
| +#include "chrome/browser/chromeos/file_system_provider/operations/unobserve_entry.h" | 
|  | 
| #include <string> | 
| #include <vector> | 
| @@ -27,48 +27,48 @@ namespace { | 
| const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj"; | 
| const char kFileSystemId[] = "testing-file-system"; | 
| const int kRequestId = 2; | 
| -const base::FilePath::CharType kDirectoryPath[] = "/kitty/and/puppy/happy"; | 
| +const base::FilePath::CharType kEntryPath[] = "/kitty/and/puppy/happy"; | 
|  | 
| }  // namespace | 
|  | 
| -class FileSystemProviderOperationsCreateDirectoryTest : public testing::Test { | 
| +class FileSystemProviderOperationsUnobserveEntryTest : public testing::Test { | 
| protected: | 
| -  FileSystemProviderOperationsCreateDirectoryTest() {} | 
| -  virtual ~FileSystemProviderOperationsCreateDirectoryTest() {} | 
| +  FileSystemProviderOperationsUnobserveEntryTest() {} | 
| +  virtual ~FileSystemProviderOperationsUnobserveEntryTest() {} | 
|  | 
| virtual void SetUp() OVERRIDE { | 
| file_system_info_ = | 
| ProvidedFileSystemInfo(kExtensionId, | 
| kFileSystemId, | 
| "" /* file_system_name */, | 
| -                               true /* writable */, | 
| +                               false /* writable */, | 
| base::FilePath() /* mount_path */); | 
| } | 
|  | 
| ProvidedFileSystemInfo file_system_info_; | 
| }; | 
|  | 
| -TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute) { | 
| -  using extensions::api::file_system_provider::CreateDirectoryRequestedOptions; | 
| +TEST_F(FileSystemProviderOperationsUnobserveEntryTest, Execute) { | 
| +  using extensions::api::file_system_provider::UnobserveEntryRequestedOptions; | 
|  | 
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */); | 
| util::StatusCallbackLog callback_log; | 
|  | 
| -  CreateDirectory create_directory( | 
| +  UnobserveEntry unobserve_entry( | 
| NULL, | 
| file_system_info_, | 
| -      base::FilePath::FromUTF8Unsafe(kDirectoryPath), | 
| +      base::FilePath::FromUTF8Unsafe(kEntryPath), | 
| true /* recursive */, | 
| base::Bind(&util::LogStatusCallback, &callback_log)); | 
| -  create_directory.SetDispatchEventImplForTesting( | 
| +  unobserve_entry.SetDispatchEventImplForTesting( | 
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, | 
| base::Unretained(&dispatcher))); | 
|  | 
| -  EXPECT_TRUE(create_directory.Execute(kRequestId)); | 
| +  EXPECT_TRUE(unobserve_entry.Execute(kRequestId)); | 
|  | 
| ASSERT_EQ(1u, dispatcher.events().size()); | 
| extensions::Event* event = dispatcher.events()[0]; | 
| -  EXPECT_EQ(extensions::api::file_system_provider::OnCreateDirectoryRequested:: | 
| +  EXPECT_EQ(extensions::api::file_system_provider::OnUnobserveEntryRequested:: | 
| kEventName, | 
| event->event_name); | 
| base::ListValue* event_args = event->event_args.get(); | 
| @@ -77,33 +77,33 @@ TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute) { | 
| const base::DictionaryValue* options_as_value = NULL; | 
| ASSERT_TRUE(event_args->GetDictionary(0, &options_as_value)); | 
|  | 
| -  CreateDirectoryRequestedOptions options; | 
| +  UnobserveEntryRequestedOptions options; | 
| ASSERT_TRUE( | 
| -      CreateDirectoryRequestedOptions::Populate(*options_as_value, &options)); | 
| +      UnobserveEntryRequestedOptions::Populate(*options_as_value, &options)); | 
| EXPECT_EQ(kFileSystemId, options.file_system_id); | 
| EXPECT_EQ(kRequestId, options.request_id); | 
| -  EXPECT_EQ(kDirectoryPath, options.directory_path); | 
| +  EXPECT_EQ(kEntryPath, options.entry_path); | 
| EXPECT_TRUE(options.recursive); | 
| } | 
|  | 
| -TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute_NoListener) { | 
| +TEST_F(FileSystemProviderOperationsUnobserveEntryTest, Execute_NoListener) { | 
| util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */); | 
| util::StatusCallbackLog callback_log; | 
|  | 
| -  CreateDirectory create_directory( | 
| +  UnobserveEntry unobserve_entry( | 
| NULL, | 
| file_system_info_, | 
| -      base::FilePath::FromUTF8Unsafe(kDirectoryPath), | 
| +      base::FilePath::FromUTF8Unsafe(kEntryPath), | 
| true /* recursive */, | 
| base::Bind(&util::LogStatusCallback, &callback_log)); | 
| -  create_directory.SetDispatchEventImplForTesting( | 
| +  unobserve_entry.SetDispatchEventImplForTesting( | 
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, | 
| base::Unretained(&dispatcher))); | 
|  | 
| -  EXPECT_FALSE(create_directory.Execute(kRequestId)); | 
| +  EXPECT_FALSE(unobserve_entry.Execute(kRequestId)); | 
| } | 
|  | 
| -TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute_ReadOnly) { | 
| +TEST_F(FileSystemProviderOperationsUnobserveEntryTest, Execute_ReadOnly) { | 
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */); | 
| util::StatusCallbackLog callback_log; | 
|  | 
| @@ -114,61 +114,61 @@ TEST_F(FileSystemProviderOperationsCreateDirectoryTest, Execute_ReadOnly) { | 
| false /* writable */, | 
| base::FilePath() /* mount_path */); | 
|  | 
| -  CreateDirectory create_directory( | 
| +  UnobserveEntry unobserve_entry( | 
| NULL, | 
| read_only_file_system_info, | 
| -      base::FilePath::FromUTF8Unsafe(kDirectoryPath), | 
| +      base::FilePath::FromUTF8Unsafe(kEntryPath), | 
| true /* recursive */, | 
| base::Bind(&util::LogStatusCallback, &callback_log)); | 
| -  create_directory.SetDispatchEventImplForTesting( | 
| +  unobserve_entry.SetDispatchEventImplForTesting( | 
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, | 
| base::Unretained(&dispatcher))); | 
|  | 
| -  EXPECT_FALSE(create_directory.Execute(kRequestId)); | 
| +  EXPECT_FALSE(unobserve_entry.Execute(kRequestId)); | 
| } | 
|  | 
| -TEST_F(FileSystemProviderOperationsCreateDirectoryTest, OnSuccess) { | 
| +TEST_F(FileSystemProviderOperationsUnobserveEntryTest, OnSuccess) { | 
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */); | 
| util::StatusCallbackLog callback_log; | 
|  | 
| -  CreateDirectory create_directory( | 
| +  UnobserveEntry unobserve_entry( | 
| NULL, | 
| file_system_info_, | 
| -      base::FilePath::FromUTF8Unsafe(kDirectoryPath), | 
| +      base::FilePath::FromUTF8Unsafe(kEntryPath), | 
| true /* recursive */, | 
| base::Bind(&util::LogStatusCallback, &callback_log)); | 
| -  create_directory.SetDispatchEventImplForTesting( | 
| +  unobserve_entry.SetDispatchEventImplForTesting( | 
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, | 
| base::Unretained(&dispatcher))); | 
|  | 
| -  EXPECT_TRUE(create_directory.Execute(kRequestId)); | 
| +  EXPECT_TRUE(unobserve_entry.Execute(kRequestId)); | 
|  | 
| -  create_directory.OnSuccess(kRequestId, | 
| -                             scoped_ptr<RequestValue>(new RequestValue()), | 
| -                             false /* has_more */); | 
| +  unobserve_entry.OnSuccess(kRequestId, | 
| +                            scoped_ptr<RequestValue>(new RequestValue()), | 
| +                            false /* has_more */); | 
| ASSERT_EQ(1u, callback_log.size()); | 
| EXPECT_EQ(base::File::FILE_OK, callback_log[0]); | 
| } | 
|  | 
| -TEST_F(FileSystemProviderOperationsCreateDirectoryTest, OnError) { | 
| +TEST_F(FileSystemProviderOperationsUnobserveEntryTest, OnError) { | 
| util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */); | 
| util::StatusCallbackLog callback_log; | 
|  | 
| -  CreateDirectory create_directory( | 
| +  UnobserveEntry unobserve_entry( | 
| NULL, | 
| file_system_info_, | 
| -      base::FilePath::FromUTF8Unsafe(kDirectoryPath), | 
| +      base::FilePath::FromUTF8Unsafe(kEntryPath), | 
| true /* recursive */, | 
| base::Bind(&util::LogStatusCallback, &callback_log)); | 
| -  create_directory.SetDispatchEventImplForTesting( | 
| +  unobserve_entry.SetDispatchEventImplForTesting( | 
| base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl, | 
| base::Unretained(&dispatcher))); | 
|  | 
| -  EXPECT_TRUE(create_directory.Execute(kRequestId)); | 
| +  EXPECT_TRUE(unobserve_entry.Execute(kRequestId)); | 
|  | 
| -  create_directory.OnError(kRequestId, | 
| -                           scoped_ptr<RequestValue>(new RequestValue()), | 
| -                           base::File::FILE_ERROR_TOO_MANY_OPENED); | 
| +  unobserve_entry.OnError(kRequestId, | 
| +                          scoped_ptr<RequestValue>(new RequestValue()), | 
| +                          base::File::FILE_ERROR_TOO_MANY_OPENED); | 
| ASSERT_EQ(1u, callback_log.size()); | 
| EXPECT_EQ(base::File::FILE_ERROR_TOO_MANY_OPENED, callback_log[0]); | 
| } | 
|  |