diff options
Diffstat (limited to 'chrome/browser/sync/test/integration')
6 files changed, 25 insertions, 12 deletions
diff --git a/chrome/browser/sync/test/integration/apps_helper.cc b/chrome/browser/sync/test/integration/apps_helper.cc index dea553d..a73c17d 100644 --- a/chrome/browser/sync/test/integration/apps_helper.cc +++ b/chrome/browser/sync/test/integration/apps_helper.cc @@ -42,7 +42,9 @@ bool AllProfilesHaveSameAppsAsVerifier() { std::string InstallApp(Profile* profile, int index) { return SyncExtensionHelper::GetInstance()->InstallExtension( - profile, CreateFakeAppName(index), Extension::TYPE_HOSTED_APP); + profile, + CreateFakeAppName(index), + extensions::Extension::TYPE_HOSTED_APP); } std::string InstallAppForAllProfiles(int index) { @@ -78,7 +80,7 @@ void IncognitoDisableApp(Profile* profile, int index) { void InstallAppsPendingForSync(Profile* profile) { SyncExtensionHelper::GetInstance()->InstallExtensionsPendingForSync( - profile, Extension::TYPE_HOSTED_APP); + profile, extensions::Extension::TYPE_HOSTED_APP); } StringOrdinal GetPageOrdinalForApp(Profile* profile, diff --git a/chrome/browser/sync/test/integration/extensions_helper.cc b/chrome/browser/sync/test/integration/extensions_helper.cc index e6873b3..66fd789 100644 --- a/chrome/browser/sync/test/integration/extensions_helper.cc +++ b/chrome/browser/sync/test/integration/extensions_helper.cc @@ -51,7 +51,9 @@ bool AllProfilesHaveSameExtensions() { std::string InstallExtension(Profile* profile, int index) { return SyncExtensionHelper::GetInstance()->InstallExtension( - profile, CreateFakeExtensionName(index), Extension::TYPE_EXTENSION); + profile, + CreateFakeExtensionName(index), + extensions::Extension::TYPE_EXTENSION); } std::string InstallExtensionForAllProfiles(int index) { @@ -111,7 +113,7 @@ bool IsIncognitoEnabled(Profile* profile, int index) { void InstallExtensionsPendingForSync(Profile* profile) { SyncExtensionHelper::GetInstance()->InstallExtensionsPendingForSync( - profile, Extension::TYPE_EXTENSION); + profile, extensions::Extension::TYPE_EXTENSION); } std::string CreateFakeExtensionName(int index) { diff --git a/chrome/browser/sync/test/integration/sync_app_helper.cc b/chrome/browser/sync/test/integration/sync_app_helper.cc index efa61c7..e70128d 100644 --- a/chrome/browser/sync/test/integration/sync_app_helper.cc +++ b/chrome/browser/sync/test/integration/sync_app_helper.cc @@ -60,7 +60,7 @@ AppStateMap GetAppStates(Profile* profile) { extension_service->GenerateInstalledExtensionsSet()); for (ExtensionSet::const_iterator it = extensions->begin(); it != extensions->end(); ++it) { - if ((*it)->GetSyncType() == Extension::SYNC_TYPE_APP) { + if ((*it)->GetSyncType() == extensions::Extension::SYNC_TYPE_APP) { const std::string& id = (*it)->id(); LoadApp(extension_service, id, &(app_state_map[id])); } diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.cc b/chrome/browser/sync/test/integration/sync_extension_helper.cc index 41db664..f32989a 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.cc +++ b/chrome/browser/sync/test/integration/sync_extension_helper.cc @@ -20,6 +20,8 @@ #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" #include "testing/gtest/include/gtest/gtest.h" +using extensions::Extension; + SyncExtensionHelper::ExtensionState::ExtensionState() : enabled_state(ENABLED), incognito_enabled(false) {} diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h index 1e85afe..2b1dc71 100644 --- a/chrome/browser/sync/test/integration/sync_extension_helper.h +++ b/chrome/browser/sync/test/integration/sync_extension_helper.h @@ -19,6 +19,10 @@ class Profile; class SyncTest; +namespace extensions { +class Extension; +} + class SyncExtensionHelper { public: // Singleton implementation. @@ -33,8 +37,9 @@ class SyncExtensionHelper { // Installs the extension with the given name to |profile|, and returns the // extension ID of the new extension. - std::string InstallExtension( - Profile* profile, const std::string& name, Extension::Type type); + std::string InstallExtension(Profile* profile, + const std::string& name, + extensions::Extension::Type type); // Uninstalls the extension with the given name from |profile|. void UninstallExtension(Profile* profile, const std::string& name); @@ -68,7 +73,8 @@ class SyncExtensionHelper { // Installs all extensions pending sync in |profile| of the given // type. - void InstallExtensionsPendingForSync(Profile* profile, Extension::Type type); + void InstallExtensionsPendingForSync(Profile* profile, + extensions::Extension::Type type); // Returns true iff |profile1| and |profile2| have the same extensions and // they are all in the same state. @@ -87,7 +93,8 @@ class SyncExtensionHelper { }; typedef std::map<std::string, ExtensionState> ExtensionStateMap; - typedef std::map<std::string, scoped_refptr<Extension> > ExtensionNameMap; + typedef std::map<std::string, scoped_refptr<extensions::Extension> > + ExtensionNameMap; typedef std::map<Profile*, ExtensionNameMap> ProfileExtensionNameMap; typedef std::map<std::string, std::string> StringMap; @@ -106,9 +113,9 @@ class SyncExtensionHelper { // Returns an extension for the given name in |profile|. type and // index. Two extensions with the name but different profiles will // have the same id. - scoped_refptr<Extension> GetExtension( + scoped_refptr<extensions::Extension> GetExtension( Profile* profile, const std::string& name, - Extension::Type type) WARN_UNUSED_RESULT; + extensions::Extension::Type type) WARN_UNUSED_RESULT; ProfileExtensionNameMap profile_extensions_; StringMap id_to_name_; diff --git a/chrome/browser/sync/test/integration/themes_helper.cc b/chrome/browser/sync/test/integration/themes_helper.cc index d2d9edd..0ff10ce 100644 --- a/chrome/browser/sync/test/integration/themes_helper.cc +++ b/chrome/browser/sync/test/integration/themes_helper.cc @@ -60,7 +60,7 @@ bool HasOrWillHaveCustomTheme(Profile* profile, const std::string& id) { void UseCustomTheme(Profile* profile, int index) { SyncExtensionHelper::GetInstance()->InstallExtension( - profile, MakeName(index), Extension::TYPE_THEME); + profile, MakeName(index), extensions::Extension::TYPE_THEME); } void UseDefaultTheme(Profile* profile) { |