Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(449)

Unified Diff: chrome/browser/extensions/extension_sorting_unittest.cc

Issue 10977048: Fix bug in disabling sync for default apps (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fix browser and integration tests, which got broken Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_sorting_unittest.cc
diff --git a/chrome/browser/extensions/extension_sorting_unittest.cc b/chrome/browser/extensions/extension_sorting_unittest.cc
index 8162dc44a2674e7dc9ee201605397c132f964ee2..8158b901440a4f806edc71f2bcbe5eb31146be7a 100644
--- a/chrome/browser/extensions/extension_sorting_unittest.cc
+++ b/chrome/browser/extensions/extension_sorting_unittest.cc
@@ -28,7 +28,7 @@ class ExtensionSortingAppLocation : public ExtensionSortingTest {
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 {
@@ -54,7 +54,7 @@ class ExtensionSortingAppLaunchOrdinal : public ExtensionSortingTest {
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 {
@@ -104,7 +104,7 @@ class ExtensionSortingPageOrdinal : public ExtensionSortingTest {
// 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_));
@@ -112,7 +112,7 @@ class ExtensionSortingPageOrdinal : public ExtensionSortingTest {
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())));
}
@@ -631,7 +631,6 @@ class ExtensionSortingPreinstalledAppsBase
simple_dict, Extension::NO_FLAGS, &error);
prefs()->OnExtensionInstalled(app1_scoped_.get(),
Extension::ENABLED,
- false,
syncer::StringOrdinal());
app2_scoped_ = Extension::Create(
@@ -639,7 +638,6 @@ class ExtensionSortingPreinstalledAppsBase
simple_dict, Extension::NO_FLAGS, &error);
prefs()->OnExtensionInstalled(app2_scoped_.get(),
Extension::ENABLED,
- false,
syncer::StringOrdinal());
app1_ = app1_scoped_.get();
@@ -824,7 +822,7 @@ class ExtensionSortingDefaultOrdinalsBase : public ExtensionSortingTest {
virtual void InstallApps() {
prefs()->OnExtensionInstalled(app_.get(), Extension::ENABLED,
- false, syncer::StringOrdinal());
+ syncer::StringOrdinal());
}
scoped_refptr<Extension> app_;
@@ -870,7 +868,7 @@ class ExtensionSortingDefaultOrdinalOverriddenByInstallPage
virtual void InstallApps() OVERRIDE {
install_page_ = default_page_ordinal_.CreateAfter();
prefs()->OnExtensionInstalled(app_.get(), Extension::ENABLED,
- false, install_page_);
+ install_page_);
}
private:
« no previous file with comments | « chrome/browser/extensions/extension_service_unittest.cc ('k') | chrome/browser/extensions/installed_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698