Do not assign launch ordinals to ephemeral apps

chrome/browser/apps/ephemeral_app_browsertest.cc

Index: chrome/browser/apps/ephemeral_app_browsertest.cc
diff --git a/chrome/browser/apps/ephemeral_app_browsertest.cc b/chrome/browser/apps/ephemeral_app_browsertest.cc
index ab10ff681cf2943ece850c2b54f7ef54529c8273..6c60d4fb76388a9afdf8d8ef5d9556da7a42ffcf 100644
--- a/chrome/browser/apps/ephemeral_app_browsertest.cc
+++ b/chrome/browser/apps/ephemeral_app_browsertest.cc
@@ -299,6 +299,21 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
         process_manager()->GetBackgroundHostForExtension(app_id));
   }
 
+  // Verify properties of ephemeral apps.
+  void VerifyEphemeralApp(const std::string& app_id) {
+    EXPECT_TRUE(extensions::util::IsEphemeralApp(app_id, profile()));
+
+    // Ephemeral apps should not be synced.
+    scoped_ptr<AppSyncData> sync_change = GetLastSyncChangeForApp(app_id);
+    EXPECT_FALSE(sync_change.get());
+
+    // Ephemeral apps should not be assigned ordinals.
+    extensions::AppSorting* app_sorting =
+        ExtensionPrefs::Get(profile())->app_sorting();
+    EXPECT_FALSE(app_sorting->GetAppLaunchOrdinal(app_id).IsValid());
+    EXPECT_FALSE(app_sorting->GetPageOrdinal(app_id).IsValid());
+  }
+
   // Verify that after ephemeral apps stop running, they reside in extension
   // system in a disabled and unloaded state.
   void VerifyInactiveEphemeralApp(const std::string& app_id) {
@@ -380,10 +395,7 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
       const Extension* app,
       ExtensionRegistry::IncludeFlag expected_set) {
     ASSERT_TRUE(app);
-
-    // Ephemeral apps should not be synced.
-    scoped_ptr<AppSyncData> sync_change = GetFirstSyncChangeForApp(app->id());
-    EXPECT_FALSE(sync_change.get());
+    VerifyEphemeralApp(app->id());
 
     // Promote the app to a regular installed app.
     InstallObserver installed_observer(profile());
@@ -398,7 +410,7 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
     EXPECT_TRUE(params.from_ephemeral);
 
     // The installation should now be synced.
-    sync_change = GetFirstSyncChangeForApp(app->id());
+    scoped_ptr<AppSyncData> sync_change = GetLastSyncChangeForApp(app->id());
     VerifySyncChange(sync_change.get(),
                      expected_set == ExtensionRegistry::ENABLED);
   }
@@ -408,6 +420,7 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
       bool enable_from_sync,
       ExtensionRegistry::IncludeFlag expected_set) {
     ASSERT_TRUE(app);
+    VerifyEphemeralApp(app->id());
 
     // Simulate an install from sync.
     const syncer::StringOrdinal kAppLaunchOrdinal("x");
@@ -449,17 +462,17 @@ class EphemeralAppBrowserTest : public EphemeralAppTestBase {
             new syncer::SyncErrorFactoryMock()));
   }
 
-  scoped_ptr<AppSyncData> GetFirstSyncChangeForApp(const std::string& id) {
+  scoped_ptr<AppSyncData> GetLastSyncChangeForApp(const std::string& id) {
     scoped_ptr<AppSyncData> sync_data;
     for (syncer::SyncChangeList::iterator it =
              mock_sync_processor_.changes().begin();
          it != mock_sync_processor_.changes().end(); ++it) {
-      sync_data.reset(new AppSyncData(*it));
-      if (sync_data->id() == id)
-        return sync_data.Pass();
+      scoped_ptr<AppSyncData> data(new AppSyncData(*it));
+      if (data->id() == id)
+        sync_data.reset(data.release());
     }
 
-    return scoped_ptr<AppSyncData>();
+    return sync_data.Pass();
   }
 
   void VerifySyncChange(const AppSyncData* sync_change, bool expect_enabled) {
@@ -573,16 +586,19 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest, RestartEventReceived) {
 // Verify that an updated ephemeral app will still have its ephemeral flag
 // enabled.
 IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest, UpdateEphemeralApp) {
+  InitSyncService();
+
   const Extension* app_v1 = InstallAndLaunchEphemeralApp(kMessagingReceiverApp);
   ASSERT_TRUE(app_v1);
-  CloseAppWaitForUnload(app_v1->id());
-  VerifyInactiveEphemeralApp(app_v1->id());
-
   std::string app_id = app_v1->id();
   base::Version app_original_version = *app_v1->version();
-  app_v1 = NULL;  // The extension object will be destroyed during update.
+
+  VerifyEphemeralApp(app_id);
+  CloseAppWaitForUnload(app_id);
+  VerifyInactiveEphemeralApp(app_id);
 
   // Update to version 2 of the app.
+  app_v1 = NULL;  // The extension object will be destroyed during update.
   InstallObserver installed_observer(profile());
   const Extension* app_v2 =
       UpdateEphemeralApp(app_id,
@@ -599,7 +615,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest, UpdateEphemeralApp) {
   // The ephemeral flag should still be set.
   ASSERT_TRUE(app_v2);
   EXPECT_GT(app_v2->version()->CompareTo(app_original_version), 0);
-  EXPECT_TRUE(extensions::util::IsEphemeralApp(app_v2->id(), profile()));
+  VerifyEphemeralApp(app_id);
 
   // The app should still be disabled in extension system.
   VerifyInactiveEphemeralApp(app_id);
@@ -780,7 +796,7 @@ IN_PROC_BROWSER_TEST_F(EphemeralAppBrowserTest,
   PromoteEphemeralAppAndVerify(app, ExtensionRegistry::BLACKLISTED);
 
   // The app should be synced, but disabled.
-  scoped_ptr<AppSyncData> sync_change = GetFirstSyncChangeForApp(app->id());
+  scoped_ptr<AppSyncData> sync_change = GetLastSyncChangeForApp(app->id());
   VerifySyncChange(sync_change.get(), false);
 }