Move content settings extension API to content_settings dir.

chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc

Index: chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
diff --git a/chrome/browser/extensions/extension_content_settings_store_unittest.cc b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
similarity index 89%
rename from chrome/browser/extensions/extension_content_settings_store_unittest.cc
rename to chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
index ccbc0e2e4efc087d4001df04e80df808b2c638d5..862c1db814b20f93720c4c4c80157d31bf13e532 100644
--- a/chrome/browser/extensions/extension_content_settings_store_unittest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_content_settings_store.h"
+#include "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
@@ -23,6 +23,8 @@ void CheckRule(const content_settings::Rule& rule,
   EXPECT_EQ(setting, content_settings::ValueToContentSetting(rule.value.get()));
 }
 
+namespace extensions {
+
 // Helper class which returns monotonically-increasing base::Time objects.
 class FakeTimer {
  public:
@@ -36,15 +38,15 @@ class FakeTimer {
   int64 internal_;
 };
 
-class MockExtensionContentSettingsStoreObserver
-    : public ExtensionContentSettingsStore::Observer {
+class MockContentSettingsStoreObserver
+    : public ContentSettingsStore::Observer {
  public:
   MOCK_METHOD2(OnContentSettingChanged,
                void(const std::string& extension_id, bool incognito));
 };
 
 ContentSetting GetContentSettingFromStore(
-    const ExtensionContentSettingsStore* store,
+    const ContentSettingsStore* store,
     const GURL& primary_url, const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
@@ -58,7 +60,7 @@ ContentSetting GetContentSettingFromStore(
 }
 
 void GetSettingsForOneTypeFromStore(
-    const ExtensionContentSettingsStore* store,
+    const ContentSettingsStore* store,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool incognito,
@@ -72,10 +74,10 @@ void GetSettingsForOneTypeFromStore(
 
 }  // namespace
 
-class ExtensionContentSettingsStoreTest : public ::testing::Test {
+class ContentSettingsStoreTest : public ::testing::Test {
  public:
-  ExtensionContentSettingsStoreTest() :
-      store_(new ExtensionContentSettingsStore()) {
+  ContentSettingsStoreTest() :
+      store_(new ContentSettingsStore()) {
   }
 
  protected:
@@ -83,17 +85,17 @@ class ExtensionContentSettingsStoreTest : public ::testing::Test {
     store_->RegisterExtension(ext_id, timer_.GetNext(), true);
   }
 
-  ExtensionContentSettingsStore* store() {
+  ContentSettingsStore* store() {
     return store_.get();
   }
 
  private:
   FakeTimer timer_;
-  scoped_refptr<ExtensionContentSettingsStore> store_;
+  scoped_refptr<ContentSettingsStore> store_;
 };
 
-TEST_F(ExtensionContentSettingsStoreTest, RegisterUnregister) {
-  ::testing::StrictMock<MockExtensionContentSettingsStoreObserver> observer;
+TEST_F(ContentSettingsStoreTest, RegisterUnregister) {
+  ::testing::StrictMock<MockContentSettingsStoreObserver> observer;
   store()->AddObserver(&observer);
 
   GURL url("http://www.youtube.com");
@@ -114,7 +116,7 @@ TEST_F(ExtensionContentSettingsStoreTest, RegisterUnregister) {
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromURL(GURL("http://www.youtube.com"));
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id, false));
-  store()->SetExtensionContentSetting(
+  store()->SetContentSetting(
       ext_id,
       pattern,
       pattern,
@@ -137,7 +139,7 @@ TEST_F(ExtensionContentSettingsStoreTest, RegisterUnregister) {
   std::string ext_id_2("my_second_extension");
   RegisterExtension(ext_id_2);
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id_2, false));
-  store()->SetExtensionContentSetting(
+  store()->SetContentSetting(
       ext_id_2,
       pattern,
       pattern,
@@ -184,7 +186,7 @@ TEST_F(ExtensionContentSettingsStoreTest, RegisterUnregister) {
   store()->RemoveObserver(&observer);
 }
 
-TEST_F(ExtensionContentSettingsStoreTest, GetAllSettings) {
+TEST_F(ContentSettingsStoreTest, GetAllSettings) {
   bool incognito = false;
   std::vector<content_settings::Rule> rules;
   GetSettingsForOneTypeFromStore(
@@ -196,7 +198,7 @@ TEST_F(ExtensionContentSettingsStoreTest, GetAllSettings) {
   RegisterExtension(ext_id);
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromURL(GURL("http://www.youtube.com"));
-  store()->SetExtensionContentSetting(
+  store()->SetContentSetting(
       ext_id,
       pattern,
       pattern,
@@ -215,7 +217,7 @@ TEST_F(ExtensionContentSettingsStoreTest, GetAllSettings) {
   RegisterExtension(ext_id_2);
   ContentSettingsPattern pattern_2 =
       ContentSettingsPattern::FromURL(GURL("http://www.example.com"));
-  store()->SetExtensionContentSetting(
+  store()->SetContentSetting(
       ext_id_2,
       pattern_2,
       pattern_2,
@@ -249,3 +251,5 @@ TEST_F(ExtensionContentSettingsStoreTest, GetAllSettings) {
       store(), CONTENT_SETTINGS_TYPE_COOKIES, "", incognito, &rules);
   ASSERT_EQ(0u, rules.size());
 }
+
+}  // namespace extensions