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

Unified Diff: chrome/browser/extensions/extension_prefs_unittest.h

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_prefs_unittest.h
diff --git a/chrome/browser/extensions/extension_prefs_unittest.h b/chrome/browser/extensions/extension_prefs_unittest.h
index bda1dca17241632c0f426837d4073d3cb2f2b129..7a97651d484bc41baa52e2e00ec83d7ecfb4dffd 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.h
+++ b/chrome/browser/extensions/extension_prefs_unittest.h
@@ -15,6 +15,10 @@ namespace base {
class Value;
}
+namespace extensions {
+class Extension;
+}
+
// Base class for extension preference-related unit tests.
class ExtensionPrefsTest : public testing::Test {
public:
@@ -57,41 +61,41 @@ class ExtensionPrefsPrepopulatedTest : public ExtensionPrefsTest {
virtual void RegisterPreferences() OVERRIDE;
- void InstallExtControlledPref(Extension *ext,
+ void InstallExtControlledPref(extensions::Extension* ext,
const std::string& key,
base::Value* val);
- void InstallExtControlledPrefIncognito(Extension *ext,
+ void InstallExtControlledPrefIncognito(extensions::Extension* ext,
const std::string& key,
base::Value* val);
void InstallExtControlledPrefIncognitoSessionOnly(
- Extension *ext,
+ extensions::Extension* ext,
const std::string& key,
base::Value* val);
- void InstallExtension(Extension *ext);
+ void InstallExtension(extensions::Extension* ext);
void UninstallExtension(const std::string& extension_id);
// Weak references, for convenience.
- Extension* ext1_;
- Extension* ext2_;
- Extension* ext3_;
- Extension* ext4_;
+ extensions::Extension* ext1_;
+ extensions::Extension* ext2_;
+ extensions::Extension* ext3_;
+ extensions::Extension* ext4_;
// Flags indicating whether each of the extensions has been installed, yet.
bool installed[4];
private:
- void EnsureExtensionInstalled(Extension *ext);
+ void EnsureExtensionInstalled(extensions::Extension *ext);
void EnsureExtensionUninstalled(const std::string& extension_id);
- scoped_refptr<Extension> ext1_scoped_;
- scoped_refptr<Extension> ext2_scoped_;
- scoped_refptr<Extension> ext3_scoped_;
- scoped_refptr<Extension> ext4_scoped_;
+ scoped_refptr<extensions::Extension> ext1_scoped_;
+ scoped_refptr<extensions::Extension> ext2_scoped_;
+ scoped_refptr<extensions::Extension> ext3_scoped_;
+ scoped_refptr<extensions::Extension> ext4_scoped_;
};
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_prefs_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698