[fsp] Simplify ID of provided file systems.

chrome/browser/chromeos/file_system_provider/service_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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/chromeos/file_system_provider/observer.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system.h"
@@ skipping 54 matching lines @@
   scoped_ptr<TestingProfile> profile_;
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
   FakeUserManager* user_manager_;
   scoped_ptr<Service> file_system_provider_service_;
 };
 
 TEST_F(FileSystemProviderServiceTest, RegisterFileSystem) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
-  const std::string file_system_id =
-      file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                        kFileSystemName);
+  int file_system_id = file_system_provider_service_->RegisterFileSystem(
+      kExtensionId, kFileSystemName);
 
-  EXPECT_NE("", file_system_id);
+  EXPECT_LT(0, file_system_id);
   ASSERT_EQ(1u, observer.registered.size());
   EXPECT_EQ(kExtensionId, observer.registered[0]->extension_id());
-  EXPECT_EQ("mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash",
-            observer.registered[0]->file_system_id());
+  EXPECT_EQ(1, observer.registered[0]->file_system_id());
   EXPECT_EQ("/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash",
             observer.registered[0]->mount_path().AsUTF8Unsafe());
   EXPECT_EQ(kFileSystemName, observer.registered[0]->file_system_name());
   ASSERT_EQ(0u, observer.unregistered.size());
 
   std::vector<ProvidedFileSystem> provided_file_systems =
       file_system_provider_service_->GetRegisteredFileSystems();
   ASSERT_EQ(1u, provided_file_systems.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, RegisterFileSystem_UniqueIds) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
-  std::string file_system_first_id =
-      file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                        kFileSystemName);
-  ASSERT_NE("", file_system_first_id);
+  int file_system_first_id = file_system_provider_service_->RegisterFileSystem(
+      kExtensionId, kFileSystemName);
+  ASSERT_LT(0, file_system_first_id);
 
-  std::string file_system_second_id =
-      file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                        kFileSystemName);
-  ASSERT_NE("", file_system_second_id);
+  int file_system_second_id = file_system_provider_service_->RegisterFileSystem(
+      kExtensionId, kFileSystemName);
+  ASSERT_LT(0, file_system_second_id);
 
   ASSERT_NE(file_system_first_id, file_system_second_id);
   ASSERT_EQ(2u, observer.registered.size());
 
   std::vector<ProvidedFileSystem> provided_file_systems =
       file_system_provider_service_->GetRegisteredFileSystems();
   ASSERT_EQ(2u, provided_file_systems.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, RegisterFileSystem_StressTest) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
   static const size_t kMaxFileSystems = 16;
   for (size_t i = 0; i < kMaxFileSystems; ++i) {
-    std::string file_system_id =
-        file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                          kFileSystemName);
-    ASSERT_NE("", file_system_id);
+    int file_system_id = file_system_provider_service_->RegisterFileSystem(
+        kExtensionId, kFileSystemName);
+    ASSERT_LT(0, file_system_id);
   }
   ASSERT_EQ(kMaxFileSystems, observer.registered.size());
 
   // The next file system is out of limit, and registering it should fail.
-  std::string file_system_id =
-      file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                        kFileSystemName);
-  ASSERT_EQ("", file_system_id);
+  int file_system_id = file_system_provider_service_->RegisterFileSystem(
+      kExtensionId, kFileSystemName);
+  ASSERT_EQ(0, file_system_id);
   ASSERT_EQ(kMaxFileSystems, observer.registered.size());
 
   std::vector<ProvidedFileSystem> provided_file_systems =
       file_system_provider_service_->GetRegisteredFileSystems();
   ASSERT_EQ(kMaxFileSystems, provided_file_systems.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnregisterFileSystem) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
-  const std::string file_system_id =
-      file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                        kFileSystemName);
-  ASSERT_NE("", file_system_id);
+  int file_system_id = file_system_provider_service_->RegisterFileSystem(
+      kExtensionId, kFileSystemName);
+  ASSERT_LT(0, file_system_id);
   ASSERT_EQ(1u, observer.registered.size());
 
   const bool result = file_system_provider_service_->UnregisterFileSystem(
       kExtensionId, file_system_id);
   ASSERT_TRUE(result);
   ASSERT_EQ(1u, observer.unregistered.size());
 
   EXPECT_EQ(kExtensionId, observer.unregistered[0]->extension_id());
-  EXPECT_EQ("mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash",
-            observer.unregistered[0]->file_system_id());
+  EXPECT_EQ(1, observer.unregistered[0]->file_system_id());
   EXPECT_EQ("/provided/mbflcebpggnecokmikipoihdbecnjfoj-1-testing_profile-hash",
             observer.unregistered[0]->mount_path().AsUTF8Unsafe());
   EXPECT_EQ(kFileSystemName, observer.unregistered[0]->file_system_name());
 
   std::vector<ProvidedFileSystem> provided_file_systems =
       file_system_provider_service_->GetRegisteredFileSystems();
   ASSERT_EQ(0u, provided_file_systems.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 TEST_F(FileSystemProviderServiceTest, UnregisterFileSystem_WrongExtensionId) {
   LoggingObserver observer;
   file_system_provider_service_->AddObserver(&observer);
 
   const std::string kWrongExtensionId = "helloworldhelloworldhelloworldhe";
 
-  const std::string file_system_id =
-      file_system_provider_service_->RegisterFileSystem(kExtensionId,
-                                                        kFileSystemName);
-  ASSERT_NE("", file_system_id);
+  int file_system_id = file_system_provider_service_->RegisterFileSystem(
+      kExtensionId, kFileSystemName);
+  ASSERT_LT(0, file_system_id);
   ASSERT_EQ(1u, observer.registered.size());
 
   const bool result = file_system_provider_service_->UnregisterFileSystem(
       kWrongExtensionId, file_system_id);
   ASSERT_FALSE(result);
   ASSERT_EQ(0u, observer.unregistered.size());
 
   std::vector<ProvidedFileSystem> provided_file_systems =
       file_system_provider_service_->GetRegisteredFileSystems();
   ASSERT_EQ(1u, provided_file_systems.size());
 
   file_system_provider_service_->RemoveObserver(&observer);
 }
 
 }  // namespace file_system_provider
 }  // namespace chromeos