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

chrome/browser/chromeos/file_system_provider/fileapi/file_stream_reader_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 <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 16 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/fileapi/async_file_util.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 
 namespace chromeos {
 namespace file_system_provider {
 namespace {
 
 const char kExtensionId[] = "mbflcebpggnecokmikipoihdbecnjfoj";
+const char kFileSystemId[] = "testing-file-system";
 
 // Logs callbacks invocations on the file stream reader.
 class EventLogger {
  public:
   EventLogger() : weak_ptr_factory_(this) {}
   virtual ~EventLogger() {}
 
   void OnRead(int result) { results_.push_back(result); }
   void OnGetLength(int64 result) { results_.push_back(result); }
 
@@ skipping 41 matching lines @@
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     profile_ = profile_manager_->CreateTestingProfile("testing-profile");
 
     ServiceFactory::GetInstance()->SetTestingFactory(profile_, &CreateService);
     Service* service = Service::Get(profile_);  // Owned by its factory.
     service->SetFileSystemFactoryForTests(
         base::Bind(&FakeProvidedFileSystem::Create));
 
-    const int file_system_id =
-        service->MountFileSystem(kExtensionId, "testing-file-system");
-    ASSERT_LT(0, file_system_id);
+    const bool result = service->MountFileSystem(
+        kExtensionId, kFileSystemId, "Testing File System");
+    ASSERT_TRUE(result);
     const ProvidedFileSystemInfo& file_system_info =
-        service->GetProvidedFileSystem(kExtensionId, file_system_id)
+        service->GetProvidedFileSystem(kExtensionId, kFileSystemId)
             ->GetFileSystemInfo();
     const std::string mount_point_name =
         file_system_info.mount_path().BaseName().AsUTF8Unsafe();
 
     file_url_ = CreateFileSystemURL(
         mount_point_name, base::FilePath::FromUTF8Unsafe(kFakeFilePath + 1));
     ASSERT_TRUE(file_url_.is_valid());
     wrong_file_url_ = CreateFileSystemURL(
         mount_point_name, base::FilePath::FromUTF8Unsafe("im-not-here.txt"));
     ASSERT_TRUE(wrong_file_url_.is_valid());
@@ skipping 172 matching lines @@
       base::Bind(&EventLogger::OnGetLength, logger.GetWeakPtr()));
   EXPECT_EQ(net::ERR_IO_PENDING, result);
   base::RunLoop().RunUntilIdle();
 
   ASSERT_EQ(1u, logger.results().size());
   EXPECT_EQ(net::ERR_FAILED, logger.results()[0]);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos