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

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

Issue 10704023: Moved ExtensionPrefs and related into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Latest-er master merged in Created 8 years, 5 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_unittest.h ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index ef70f4a1aad616848f7681b118f7c1f777eae955..9548234834c7baccd463d369977b5da34c4d07cd 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -25,11 +25,6 @@
using base::Time;
using base::TimeDelta;
using content::BrowserThread;
-using extensions::APIPermission;
-using extensions::APIPermissionSet;
-using extensions::Extension;
-using extensions::ExtensionList;
-using extensions::PermissionSet;
namespace {
@@ -46,6 +41,8 @@ const char kDefaultPref4[] = "default pref 4";
} // namespace
+namespace extensions {
+
static void AddPattern(URLPatternSet* extent, const std::string& pattern) {
int schemes = URLPattern::SCHEME_ALL;
extent->AddPattern(URLPattern(schemes, pattern));
@@ -413,7 +410,7 @@ class ExtensionPrefsBlacklist : public ExtensionPrefsTest {
EXPECT_EQ(4u, info->size());
ExtensionPrefs::ExtensionsInfo::iterator info_iter;
for (info_iter = info->begin(); info_iter != info->end(); ++info_iter) {
- extensions::ExtensionInfo* extension_info = info_iter->get();
+ ExtensionInfo* extension_info = info_iter->get();
EXPECT_NE(extensions_[0]->id(), extension_info->extension_id);
}
}
@@ -899,7 +896,7 @@ class ExtensionPrefsUninstallExtension : public ExtensionPrefsPrepopulatedTest {
virtual void Initialize() {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2"));
- extensions::ContentSettingsStore* store = prefs()->content_settings_store();
+ ContentSettingsStore* store = prefs()->content_settings_store();
ContentSettingsPattern pattern =
ContentSettingsPattern::FromString("http://[*.]example.com");
store->SetExtensionContentSetting(ext1_->id(),
@@ -1169,3 +1166,5 @@ class ExtensionPrefsNotRequiredExtension
}
};
TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
+
+} // namespace extensions
« no previous file with comments | « chrome/browser/extensions/extension_prefs_unittest.h ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698