| 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 37412b23c032eb778ccaf1d380489b9df7d723f5..ba51d30f696178719c5cd68ee3c87ab84330c9db 100644
|
| --- a/chrome/browser/extensions/extension_prefs_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_prefs_unittest.cc
|
| @@ -25,12 +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::OAuth2Scopes;
|
| -using extensions::PermissionSet;
|
|
|
| namespace {
|
|
|
| @@ -47,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));
|
| @@ -453,7 +449,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);
|
| }
|
| }
|
| @@ -939,7 +935,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(),
|
| @@ -1209,3 +1205,5 @@ class ExtensionPrefsNotRequiredExtension
|
| }
|
| };
|
| TEST_F(ExtensionPrefsNotRequiredExtension, NotRequiredExtension) {}
|
| +
|
| +} // namespace extensions
|
|
|