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

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

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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/default_apps_unittest.cc
diff --git a/chrome/browser/extensions/default_apps_unittest.cc b/chrome/browser/extensions/default_apps_unittest.cc
index 51f367e77e43b302a19d8d72935b0c72ebe6fb2a..a909d6cd32d73bd1f054d57255d071d438c191d1 100644
--- a/chrome/browser/extensions/default_apps_unittest.cc
+++ b/chrome/browser/extensions/default_apps_unittest.cc
@@ -44,8 +44,8 @@ TEST_F(DefaultAppsTest, Install) {
extensions::ExternalLoader* loader = new MockExternalLoader();
- Provider provider(profile.get(), NULL, loader, Extension::INTERNAL,
- Extension::INTERNAL, Extension::NO_FLAGS);
+ Provider provider(profile.get(), NULL, loader, Manifest::INTERNAL,
+ Manifest::INTERNAL, Extension::NO_FLAGS);
// The default apps should be installed if kDefaultAppsInstallState
// is unknown.
@@ -80,8 +80,8 @@ TEST_F(DefaultAppsTest, Install) {
}
};
profile.reset(new DefaultTestingProfile);
- Provider provider2(profile.get(), NULL, loader, Extension::INTERNAL,
- Extension::INTERNAL, Extension::NO_FLAGS);
+ Provider provider2(profile.get(), NULL, loader, Manifest::INTERNAL,
+ Manifest::INTERNAL, Extension::NO_FLAGS);
// The old default apps with kProvideLegacyDefaultApps should be migrated
// even if the profile version is older than Chrome version.
profile->GetPrefs()->SetInteger(prefs::kDefaultAppsInstallState,
« no previous file with comments | « chrome/browser/extensions/default_apps.cc ('k') | chrome/browser/extensions/extension_action_icon_factory_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698