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

Unified Diff: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict 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
Index: chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
diff --git a/chrome/browser/extensions/extension_content_settings_apitest.cc b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
similarity index 97%
rename from chrome/browser/extensions/extension_content_settings_apitest.cc
rename to chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
index a593fa70f10816081c25a29d175e22b49c39e42a..c44e5a0fbeb0ef03c8f10948758986c44f2239da 100644
--- a/chrome/browser/extensions/extension_content_settings_apitest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_apitest.cc
@@ -3,10 +3,10 @@
// found in the LICENSE file.
#include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/content_settings/content_settings_api.h"
#include "chrome/browser/content_settings/cookie_settings.h"
#include "chrome/browser/content_settings/host_content_settings_map.h"
#include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_content_settings_api.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
@@ -14,6 +14,8 @@
#include "chrome/common/pref_names.h"
#include "webkit/plugins/npapi/mock_plugin_list.h"
+namespace extensions {
+
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentSettings) {
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableExperimentalExtensionApis);
@@ -129,3 +131,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest,
GetResourceIdentifiersFunction::SetPluginGroupsForTesting(NULL);
}
+
+} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698