Moved IS_EPHEMERAL flag to extension prefs

chrome/browser/extensions/chrome_app_sorting_unittest.cc

 // Copyright 2013 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 "chrome/browser/extensions/chrome_app_sorting.h"
 
 #include <map>
 
 #include "chrome/browser/extensions/./extension_prefs_unittest.h"
 #include "chrome/common/extensions/extension_constants.h"
@@ skipping 13 matching lines @@
 };
 
 class ChromeAppSortingAppLocation : public ChromeAppSortingTest {
  public:
   virtual void Initialize() OVERRIDE {
     extension_ = prefs_.AddExtension("not_an_app");
     // Non-apps should not have any app launch ordinal or page ordinal.
     prefs()->OnExtensionInstalled(extension_.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   syncer::StringOrdinal(),
                                   std::string());
   }
 
   virtual void Verify() OVERRIDE {
     EXPECT_FALSE(
         app_sorting()->GetAppLaunchOrdinal(extension_->id()).IsValid());
     EXPECT_FALSE(
         app_sorting()->GetPageOrdinal(extension_->id()).IsValid());
   }
 
  private:
   scoped_refptr<Extension> extension_;
 };
 TEST_F(ChromeAppSortingAppLocation, ChromeAppSortingAppLocation) {}
 
 class ChromeAppSortingAppLaunchOrdinal : public ChromeAppSortingTest {
  public:
   virtual void Initialize() OVERRIDE {
     // No extensions yet.
     syncer::StringOrdinal page = syncer::StringOrdinal::CreateInitialOrdinal();
     EXPECT_TRUE(syncer::StringOrdinal::CreateInitialOrdinal().Equals(
         app_sorting()->CreateNextAppLaunchOrdinal(page)));
 
     extension_ = prefs_.AddApp("on_extension_installed");
     EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
     prefs()->OnExtensionInstalled(extension_.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   syncer::StringOrdinal(),
                                   std::string());
   }
 
   virtual void Verify() OVERRIDE {
     syncer::StringOrdinal launch_ordinal =
         app_sorting()->GetAppLaunchOrdinal(extension_->id());
     syncer::StringOrdinal page_ordinal =
         syncer::StringOrdinal::CreateInitialOrdinal();
 
@@ skipping 33 matching lines @@
 
 class ChromeAppSortingPageOrdinal : public ChromeAppSortingTest {
  public:
   virtual void Initialize() OVERRIDE {
     extension_ = prefs_.AddApp("page_ordinal");
     // Install with a page preference.
     first_page_ = syncer::StringOrdinal::CreateInitialOrdinal();
     prefs()->OnExtensionInstalled(extension_.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   first_page_,
                                   std::string());
     EXPECT_TRUE(first_page_.Equals(
         app_sorting()->GetPageOrdinal(extension_->id())));
     EXPECT_EQ(0, app_sorting()->PageStringOrdinalAsInteger(first_page_));
 
     scoped_refptr<Extension> extension2 = prefs_.AddApp("page_ordinal_2");
     // Install without any page preference.
     prefs()->OnExtensionInstalled(extension2.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   syncer::StringOrdinal(),
                                   std::string());
     EXPECT_TRUE(first_page_.Equals(
         app_sorting()->GetPageOrdinal(extension2->id())));
   }
   virtual void Verify() OVERRIDE {
     // Set the page ordinal.
     syncer::StringOrdinal new_page = first_page_.CreateAfter();
     app_sorting()->SetPageOrdinal(extension_->id(), new_page);
     // Verify the page ordinal.
@@ skipping 496 matching lines @@
     simple_dict.SetString(keys::kApp, "true");
     simple_dict.SetString(keys::kLaunchLocalPath, "fake.html");
 
     std::string error;
     app1_scoped_ = Extension::Create(
         prefs_.temp_dir().AppendASCII("app1_"), Manifest::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &error);
     prefs()->OnExtensionInstalled(app1_scoped_.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   syncer::StringOrdinal(),
                                   std::string());
 
     app2_scoped_ = Extension::Create(
         prefs_.temp_dir().AppendASCII("app2_"), Manifest::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &error);
     prefs()->OnExtensionInstalled(app2_scoped_.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   syncer::StringOrdinal(),
                                   std::string());
 
     app1_ = app1_scoped_.get();
     app2_ = app2_scoped_.get();
   }
   virtual ~ChromeAppSortingPreinstalledAppsBase() {}
 
  protected:
   // Weak references, for convenience.
@@ skipping 167 matching lines @@
     default_app_launch_ordinal_ =
         syncer::StringOrdinal::CreateInitialOrdinal().CreateBefore();
   }
 
   virtual void SetupUserOrdinals() {}
 
   virtual void InstallApps() {
     prefs()->OnExtensionInstalled(app_.get(),
                                   Extension::ENABLED,
                                   false,
+                                  false,
                                   syncer::StringOrdinal(),
                                   std::string());
   }
 
   scoped_refptr<Extension> app_;
   syncer::StringOrdinal default_page_ordinal_;
   syncer::StringOrdinal default_app_launch_ordinal_;
 };
 
 // Tests that the app gets its default ordinals.
@@ skipping 25 matching lines @@
     AppSorting* app_sorting = prefs()->app_sorting();
 
     EXPECT_FALSE(app_sorting->GetPageOrdinal(app_->id()).Equals(
         default_page_ordinal_));
     EXPECT_TRUE(app_sorting->GetPageOrdinal(app_->id()).Equals(install_page_));
   }
 
  protected:
   virtual void InstallApps() OVERRIDE {
     install_page_ = default_page_ordinal_.CreateAfter();
-    prefs()->OnExtensionInstalled(
-        app_.get(), Extension::ENABLED, false, install_page_, std::string());
+    prefs()->OnExtensionInstalled(app_.get(),
+                                  Extension::ENABLED,
+                                  false,
+                                  false,
+                                  install_page_,
+                                  std::string());
   }
 
  private:
   syncer::StringOrdinal install_page_;
 };
 TEST_F(ChromeAppSortingDefaultOrdinalOverriddenByInstallPage,
        ChromeAppSortingDefaultOrdinalOverriddenByInstallPage) {}
 
 // Tests that the default ordinals are overridden by user values.
 class ChromeAppSortingDefaultOrdinalOverriddenByUserValue
@@ skipping 62 matching lines @@
   }
 
  private:
   scoped_refptr<Extension> other_app_;
   scoped_refptr<Extension> yet_another_app_;
 };
 TEST_F(ChromeAppSortingDefaultOrdinalNoCollision,
        ChromeAppSortingDefaultOrdinalNoCollision) {}
 
 }  // namespace extensions