Index: chrome/browser/sync/test/integration/sync_extension_helper.h |
diff --git a/chrome/browser/sync/test/integration/sync_extension_helper.h b/chrome/browser/sync/test/integration/sync_extension_helper.h |
index 1e85afe754fde6abc5d714103a589a4014b1b52a..2b1dc7135667497b0e5b872d2ac2e49e30d0ab9b 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_; |