Convert app_launch_index and page_index from int to StringOrdinal.

chrome/browser/extensions/extension_prefs_unittest.cc

Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index d10e1839d6d7b87baac2655ef2f5e66a4c5cf35d..5465e08149f1fffbd0d0158b5474dc925ef8ac88 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -577,7 +577,8 @@ class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest {
     extension_ = prefs_.AddExtension("on_extension_installed");
     EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
     prefs()->OnExtensionInstalled(
-        extension_.get(), Extension::DISABLED, false, -1);
+        extension_.get(), Extension::DISABLED, false,
+        extension_misc::kUnsetIndex);
   }
 
   virtual void Verify() {
@@ -594,31 +595,35 @@ class ExtensionPrefsAppLaunchIndex : public ExtensionPrefsTest {
  public:
   virtual void Initialize() {
     // No extensions yet.
-    EXPECT_EQ(0, prefs()->GetNextAppLaunchIndex(0));
+    EXPECT_EQ("0", prefs()->GetNextAppLaunchIndex("0"));
 
     extension_ = prefs_.AddApp("on_extension_installed");
     EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
     prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
-                                  false, -1);
+                                  false, extension_misc::kUnsetIndex);
   }
 
   virtual void Verify() {
-    int launch_index = prefs()->GetAppLaunchIndex(extension_->id());
+    std::string launch_index = prefs()->GetAppLaunchIndex(extension_->id());
+    int launch_index_int;
+    base::StringToInt(launch_index, &launch_index_int);
+
     // Extension should have been assigned a launch index > 0.
-    EXPECT_GT(launch_index, 0);
-    EXPECT_EQ(launch_index + 1, prefs()->GetNextAppLaunchIndex(0));
+    EXPECT_GT(launch_index, "0");
+    EXPECT_EQ(base::IntToString(launch_index_int + 1),
+              prefs()->GetNextAppLaunchIndex("0"));
     // Set a new launch index of one higher and verify.
     prefs()->SetAppLaunchIndex(extension_->id(),
-                               prefs()->GetNextAppLaunchIndex(0));
-    int new_launch_index = prefs()->GetAppLaunchIndex(extension_->id());
-    EXPECT_EQ(launch_index + 1, new_launch_index);
+                               prefs()->GetNextAppLaunchIndex("0"));
+    std::string new_launch_index = prefs()->GetAppLaunchIndex(extension_->id());
+    EXPECT_EQ(base::IntToString(launch_index_int + 1), new_launch_index);
 
-    // This extension doesn't exist, so it should return -1.
-    EXPECT_EQ(-1, prefs()->GetAppLaunchIndex("foo"));
+    // This extension doesn't exist, so it should return kUnsetIndex
+    EXPECT_EQ(extension_misc::kUnsetIndex, prefs()->GetAppLaunchIndex("foo"));
 
     // The second page doesn't have any apps so its next launch index should
     // still be 0.
-    EXPECT_EQ(prefs()->GetNextAppLaunchIndex(1), 0);
+    EXPECT_EQ(prefs()->GetNextAppLaunchIndex("1"), "0");
   }
 
  private:
@@ -632,24 +637,24 @@ class ExtensionPrefsPageIndex : public ExtensionPrefsTest {
     extension_ = prefs_.AddApp("page_index");
     // Install to page 3 (index 2).
     prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
-                                  false, 2);
-    EXPECT_EQ(2, prefs()->GetPageIndex(extension_->id()));
+                                  false, "2");
+    EXPECT_EQ("2", prefs()->GetPageIndex(extension_->id()));
 
     scoped_refptr<Extension> extension2 = prefs_.AddApp("page_index_2");
     // Install without any page preference.
     prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
-                                  false, -1);
-    EXPECT_EQ(0, prefs()->GetPageIndex(extension_->id()));
+                                  false, extension_misc::kUnsetIndex);
+    EXPECT_EQ("0", prefs()->GetPageIndex(extension_->id()));
   }
 
   virtual void Verify() {
     // Set the page index.
-    prefs()->SetPageIndex(extension_->id(), 1);
+    prefs()->SetPageIndex(extension_->id(), "1");
     // Verify the page index.
-    EXPECT_EQ(1, prefs()->GetPageIndex(extension_->id()));
+    EXPECT_EQ("1", prefs()->GetPageIndex(extension_->id()));
 
-    // This extension doesn't exist, so it should return -1.
-    EXPECT_EQ(-1, prefs()->GetPageIndex("foo"));
+    // This extension doesn't exist, so it should return kUnsetIndex.
+    EXPECT_EQ(extension_misc::kUnsetIndex, prefs()->GetPageIndex("foo"));
   }
 
  private:
@@ -663,12 +668,14 @@ class ExtensionPrefsAppLocation : public ExtensionPrefsTest {
     extension_ = prefs_.AddExtension("not_an_app");
     // Non-apps should not have any app launch index or page index.
     prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
-                                  false, 0);
+                                  false, "0");
   }
 
   virtual void Verify() {
-    EXPECT_EQ(-1, prefs()->GetAppLaunchIndex(extension_->id()));
-    EXPECT_EQ(-1, prefs()->GetPageIndex(extension_->id()));
+    EXPECT_EQ(extension_misc::kUnsetIndex,
+              prefs()->GetAppLaunchIndex(extension_->id()));
+    EXPECT_EQ(extension_misc::kUnsetIndex,
+              prefs()->GetPageIndex(extension_->id()));
   }
 
  private:
@@ -682,7 +689,7 @@ class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest {
     extension_ = prefs_.AddExtension("on_extension_installed");
     EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id()));
     prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
-                                  false, -1);
+                                  false, extension_misc::kUnsetIndex);
   }
 
   virtual void Verify() {
@@ -832,7 +839,8 @@ class ExtensionPrefsPreferencesBase : public ExtensionPrefsTest {
     Extension* extensions[] = {ext1_, ext2_, ext3_};
     for (int i = 0; i < 3; ++i) {
       if (ext == extensions[i] && !installed[i]) {
-        prefs()->OnExtensionInstalled(ext, Extension::ENABLED, false, -1);
+        prefs()->OnExtensionInstalled(ext, Extension::ENABLED,
+                                      false, extension_misc::kUnsetIndex);
         installed[i] = true;
         break;
       }