[fsp] Separate recursive and non-recursive watchers.

chrome/browser/chromeos/file_system_provider/operations/unobserve_entry_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 "chrome/browser/chromeos/file_system_provider/operations/unobserve_entry.h"
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
@@ skipping 38 matching lines @@
 TEST_F(FileSystemProviderOperationsUnobserveEntryTest, Execute) {
   using extensions::api::file_system_provider::UnobserveEntryRequestedOptions;
 
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
   UnobserveEntry unobserve_entry(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kEntryPath),
+      true /* recursive */,
       base::Bind(&util::LogStatusCallback, &callback_log));
   unobserve_entry.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   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::OnUnobserveEntryRequested::
                 kEventName,
             event->event_name);
   base::ListValue* event_args = event->event_args.get();
   ASSERT_EQ(1u, event_args->GetSize());
 
   const base::DictionaryValue* options_as_value = NULL;
   ASSERT_TRUE(event_args->GetDictionary(0, &options_as_value));
 
   UnobserveEntryRequestedOptions options;
   ASSERT_TRUE(
       UnobserveEntryRequestedOptions::Populate(*options_as_value, &options));
   EXPECT_EQ(kFileSystemId, options.file_system_id);
   EXPECT_EQ(kRequestId, options.request_id);
   EXPECT_EQ(kEntryPath, options.entry_path);
+  EXPECT_TRUE(options.recursive);
 }
 
 TEST_F(FileSystemProviderOperationsUnobserveEntryTest, Execute_NoListener) {
   util::LoggingDispatchEventImpl dispatcher(false /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
   UnobserveEntry unobserve_entry(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kEntryPath),
+      true /* recursive */,
       base::Bind(&util::LogStatusCallback, &callback_log));
   unobserve_entry.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_FALSE(unobserve_entry.Execute(kRequestId));
 }
 
 TEST_F(FileSystemProviderOperationsUnobserveEntryTest, OnSuccess) {
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
   UnobserveEntry unobserve_entry(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kEntryPath),
+      true /* recursive */,
       base::Bind(&util::LogStatusCallback, &callback_log));
   unobserve_entry.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(unobserve_entry.Execute(kRequestId));
 
   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(FileSystemProviderOperationsUnobserveEntryTest, OnError) {
   util::LoggingDispatchEventImpl dispatcher(true /* dispatch_reply */);
   util::StatusCallbackLog callback_log;
 
   UnobserveEntry unobserve_entry(
       NULL,
       file_system_info_,
       base::FilePath::FromUTF8Unsafe(kEntryPath),
+      true /* recursive */,
       base::Bind(&util::LogStatusCallback, &callback_log));
   unobserve_entry.SetDispatchEventImplForTesting(
       base::Bind(&util::LoggingDispatchEventImpl::OnDispatchEventImpl,
                  base::Unretained(&dispatcher)));
 
   EXPECT_TRUE(unobserve_entry.Execute(kRequestId));
 
   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]);
 }
 
 }  // namespace operations
 }  // namespace file_system_provider
 }  // namespace chromeos