Fix bug in disabling sync for default apps

chrome/browser/extensions/extension_sorting_unittest.cc

 // Copyright (c) 2012 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/extension_sorting.h"
 
 #include <map>
 
 #include "chrome/browser/extensions/extension_prefs_unittest.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ skipping 10 matching lines @@
     return prefs()->extension_sorting();
   }
 };
 
 class ExtensionSortingAppLocation : public ExtensionSortingTest {
  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, syncer::StringOrdinal());
+                                  syncer::StringOrdinal());
   }
 
   virtual void Verify() OVERRIDE {
     EXPECT_FALSE(
         extension_sorting()->GetAppLaunchOrdinal(extension_->id()).IsValid());
     EXPECT_FALSE(
         extension_sorting()->GetPageOrdinal(extension_->id()).IsValid());
   }
 
  private:
   scoped_refptr<Extension> extension_;
 };
 TEST_F(ExtensionSortingAppLocation, ExtensionSortingAppLocation) {}
 
 class ExtensionSortingAppLaunchOrdinal : public ExtensionSortingTest {
  public:
   virtual void Initialize() OVERRIDE {
     // No extensions yet.
     syncer::StringOrdinal page = syncer::StringOrdinal::CreateInitialOrdinal();
     EXPECT_TRUE(syncer::StringOrdinal::CreateInitialOrdinal().Equals(
         extension_sorting()->CreateNextAppLaunchOrdinal(page)));
 
     extension_ = prefs_.AddApp("on_extension_installed");
     EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
     prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
-                                  false, syncer::StringOrdinal());
+                                  syncer::StringOrdinal());
   }
 
   virtual void Verify() OVERRIDE {
     syncer::StringOrdinal launch_ordinal =
         extension_sorting()->GetAppLaunchOrdinal(extension_->id());
     syncer::StringOrdinal page_ordinal =
         syncer::StringOrdinal::CreateInitialOrdinal();
 
     // Extension should have been assigned a valid StringOrdinal.
     EXPECT_TRUE(launch_ordinal.IsValid());
@@ skipping 29 matching lines @@
 };
 TEST_F(ExtensionSortingAppLaunchOrdinal, ExtensionSortingAppLaunchOrdinal) {}
 
 class ExtensionSortingPageOrdinal : public ExtensionSortingTest {
  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, first_page_);
+                                  first_page_);
     EXPECT_TRUE(first_page_.Equals(
         extension_sorting()->GetPageOrdinal(extension_->id())));
     EXPECT_EQ(0, extension_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, syncer::StringOrdinal());
+                                  syncer::StringOrdinal());
     EXPECT_TRUE(first_page_.Equals(
         extension_sorting()->GetPageOrdinal(extension2->id())));
   }
   virtual void Verify() OVERRIDE {
     // Set the page ordinal.
     syncer::StringOrdinal new_page = first_page_.CreateAfter();
     extension_sorting()->SetPageOrdinal(extension_->id(), new_page);
     // Verify the page ordinal.
     EXPECT_TRUE(
         new_page.Equals(extension_sorting()->GetPageOrdinal(extension_->id())));
@@ skipping 498 matching lines @@
     simple_dict.SetString(keys::kName, "unused");
     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_"), Extension::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &error);
     prefs()->OnExtensionInstalled(app1_scoped_.get(),
                                   Extension::ENABLED,
-                                  false,
                                   syncer::StringOrdinal());
 
     app2_scoped_ = Extension::Create(
         prefs_.temp_dir().AppendASCII("app2_"), Extension::EXTERNAL_PREF,
         simple_dict, Extension::NO_FLAGS, &error);
     prefs()->OnExtensionInstalled(app2_scoped_.get(),
                                   Extension::ENABLED,
-                                  false,
                                   syncer::StringOrdinal());
 
     app1_ = app1_scoped_.get();
     app2_ = app2_scoped_.get();
   }
   virtual ~ExtensionSortingPreinstalledAppsBase() {}
 
  protected:
   // Weak references, for convenience.
   Extension* app1_;
@@ skipping 164 matching lines @@
     default_page_ordinal_ =
         syncer::StringOrdinal::CreateInitialOrdinal().CreateAfter();
     default_app_launch_ordinal_ =
         syncer::StringOrdinal::CreateInitialOrdinal().CreateBefore();
   }
 
   virtual void SetupUserOrdinals() {}
 
   virtual void InstallApps() {
     prefs()->OnExtensionInstalled(app_.get(), Extension::ENABLED,
-                                  false, syncer::StringOrdinal());
+                                  syncer::StringOrdinal());
   }
 
   scoped_refptr<Extension> app_;
   syncer::StringOrdinal default_page_ordinal_;
   syncer::StringOrdinal default_app_launch_ordinal_;
 };
 
 // Tests that the app gets its default ordinals.
 class ExtensionSortingDefaultOrdinals
     : public ExtensionSortingDefaultOrdinalsBase {
@@ skipping 25 matching lines @@
     EXPECT_FALSE(extension_sorting->GetPageOrdinal(app_->id()).Equals(
         default_page_ordinal_));
     EXPECT_TRUE(extension_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_);
+                                  install_page_);
   }
 
  private:
   syncer::StringOrdinal install_page_;
 };
 TEST_F(ExtensionSortingDefaultOrdinalOverriddenByInstallPage,
        ExtensionSortingDefaultOrdinalOverriddenByInstallPage) {}
 
 // Tests that the default ordinals are overridden by user values.
 class ExtensionSortingDefaultOrdinalOverriddenByUserValue
@@ skipping 55 matching lines @@
     extension_sorting->SetPageOrdinal(other_app_->id(), default_page_ordinal_);
     extension_sorting->SetAppLaunchOrdinal(other_app_->id(),
                                            default_app_launch_ordinal_);
   }
 
  private:
   scoped_refptr<Extension> other_app_;
 };
 TEST_F(ExtensionSortingDefaultOrdinalNoCollision,
        ExtensionSortingDefaultOrdinalNoCollision) {}