Convert app_launch_index and page_index from int to StringOrdinal.

chrome/browser/extensions/extension_service.cc

Index: chrome/browser/extensions/extension_service.cc
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index fc0935be23244ee1e4b780a16762b0465c7ad75e..1f705561080eef75a55638947eb5f2c5eb41fe9d 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -202,7 +202,7 @@ void SimpleExtensionLoadPrompt::ShowPrompt() {
 void SimpleExtensionLoadPrompt::InstallUIProceed() {
   if (extension_service_.get())
     extension_service_->OnExtensionInstalled(
-        extension_, false, -1);  // Not from web store.
+        extension_, false, extension_misc::kUnsetIndex);  // Not from web store.
   delete this;
 }
 
@@ -2295,12 +2295,16 @@ void ExtensionService::AddExtension(const Extension* extension) {
   }
 
   // Unfortunately, we used to set app launcher indices for non-apps. If this
-  // extension has an index (page or in-page), set it to -1.
+  // extension has an index (page or in-page), set it to kUnsetIndex.
   if (!extension->is_app()) {
-    if (extension_prefs_->GetAppLaunchIndex(extension->id()) != -1)
-      extension_prefs_->SetAppLaunchIndex(extension->id(), -1);
-    if (extension_prefs_->GetPageIndex(extension->id()) != -1)
-      extension_prefs_->SetPageIndex(extension->id(), -1);
+    if (extension_prefs_->GetAppLaunchIndex(
+            extension->id()).compare(extension_misc::kUnsetIndex) != 0)
+      extension_prefs_->SetAppLaunchIndex(extension->id(),
+                                          extension_misc::kUnsetIndex);
+    if (extension_prefs_->GetPageIndex(
+            extension->id()).compare(extension_misc::kUnsetIndex) != 0)
+      extension_prefs_->SetPageIndex(extension->id(),
+                                     extension_misc::kUnsetIndex);
   }
 
   extensions_.push_back(scoped_extension);
@@ -2436,11 +2440,13 @@ void ExtensionService::OnLoadSingleExtension(const Extension* extension,
     prompt->ShowPrompt();
     return;  // continues in SimpleExtensionLoadPrompt::InstallUI*
   }
-  OnExtensionInstalled(extension, false, -1);  // Not from web store.
+
+  // Not from web store.
+  OnExtensionInstalled(extension, false, extension_misc::kUnsetIndex);
 }
 
 void ExtensionService::OnExtensionInstalled(
-    const Extension* extension, bool from_webstore, int page_index) {
+    const Extension* extension, bool from_webstore, std::string page_index) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Ensure extension is deleted unless we transfer ownership.