[fsp] Let extensions decide about the file system id.

chrome/browser/chromeos/file_system_provider/provided_file_system_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.
 
 // TODO(mtomasz): Move these test cases to operations/unmount_unittest.cc.
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
@@ skipping 11 matching lines @@
 #include "extensions/browser/event_router.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace file_system_provider {
 
 namespace {
 
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
 const int kExpectedRequestId = 1;
-const int kFileSystemId = 2;
+const char kFileSystemId[] = "camera-pictures";
 const char kFileSystemName[] = "Camera Pictures";
 
 class FakeEventRouter : public extensions::EventRouter {
  public:
   explicit FakeEventRouter(Profile* profile) : EventRouter(profile, NULL) {}
   virtual ~FakeEventRouter() {}
 
   virtual void DispatchEventToExtension(const std::string& extension_id,
                                         scoped_ptr<extensions::Event> event)
       OVERRIDE {
@@ skipping 42 matching lines @@
   virtual ~FileSystemProviderProvidedFileSystemTest() {}
 
   virtual void SetUp() OVERRIDE {
     profile_.reset(new TestingProfile);
     event_router_.reset(new FakeEventRouter(profile_.get()));
     event_router_->AddEventListener(
         extensions::api::file_system_provider::OnUnmountRequested::kEventName,
         NULL,
         kExtensionId);
 
-    base::FilePath mount_path =
+    const base::FilePath mount_path =
         util::GetMountPath(profile_.get(), kExtensionId, kFileSystemId);
     file_system_info_.reset(new ProvidedFileSystemInfo(
         kExtensionId, kFileSystemId, kFileSystemName, mount_path));
     provided_file_system_.reset(
         new ProvidedFileSystem(event_router_.get(), *file_system_info_.get()));
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<FakeEventRouter> event_router_;
   scoped_ptr<ProvidedFileSystemInfo> file_system_info_;
   scoped_ptr<ProvidedFileSystemInterface> provided_file_system_;
 };
 
 TEST_F(FileSystemProviderProvidedFileSystemTest, RequestUnmount_Success) {
   EventLogger logger;
 
   provided_file_system_->RequestUnmount(
       base::Bind(&EventLogger::OnStatusCallback, logger.GetWeakPtr()));
   base::RunLoop().RunUntilIdle();
 
   // Verify that the event has been sent to the providing extension.
   EXPECT_EQ(kExtensionId, event_router_->extension_id());
   const extensions::Event* event = event_router_->event();
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->event_args);
   base::ListValue* event_args = event->event_args.get();
   EXPECT_EQ(2u, event_args->GetSize());
-  int file_system_id = 0;
-  EXPECT_TRUE(event_args->GetInteger(0, &file_system_id));
+  std::string file_system_id;
+  EXPECT_TRUE(event_args->GetString(0, &file_system_id));
   EXPECT_EQ(kFileSystemId, file_system_id);
 
   // Remember the request id, and verify it is valid.
   int request_id = 0;
   EXPECT_TRUE(event_args->GetInteger(1, &request_id));
   EXPECT_EQ(kExpectedRequestId, request_id);
 
   // Callback should not be called, yet.
   EXPECT_FALSE(logger.error());
 
@@ skipping 17 matching lines @@
       base::Bind(&EventLogger::OnStatusCallback, logger.GetWeakPtr()));
   base::RunLoop().RunUntilIdle();
 
   // Verify that the event has been sent to the providing extension.
   EXPECT_EQ(kExtensionId, event_router_->extension_id());
   const extensions::Event* event = event_router_->event();
   ASSERT_TRUE(event);
   ASSERT_TRUE(event->event_args);
   base::ListValue* event_args = event->event_args.get();
   EXPECT_EQ(2u, event_args->GetSize());
-  int file_system_id = 0;
-  EXPECT_TRUE(event_args->GetInteger(0, &file_system_id));
+  std::string file_system_id;
+  EXPECT_TRUE(event_args->GetString(0, &file_system_id));
   EXPECT_EQ(kFileSystemId, file_system_id);
 
   // Remember the request id, and verify it is valid.
   int request_id = 0;
   EXPECT_TRUE(event_args->GetInteger(1, &request_id));
   EXPECT_EQ(kExpectedRequestId, request_id);
 
   // Simulate sending an error response from the providing extension.
   RequestManager* request_manager = provided_file_system_->GetRequestManager();
   ASSERT_TRUE(request_manager);
   bool reply_result = request_manager->RejectRequest(
       request_id, base::File::FILE_ERROR_NOT_FOUND);
   EXPECT_TRUE(reply_result);
 
   // Callback should be called. Verify the error code.
   ASSERT_TRUE(logger.error());
   EXPECT_EQ(base::File::FILE_ERROR_NOT_FOUND, *logger.error());
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos