Content settings clean-up: Create content_settings_test_utils

This CL is creating new target test_utils and moving functions used only in unit tests there.

BUG=399895
TBR=jhawkins@chromium.org

Review URL: https://codereview.chromium.org/700853003

Cr-Commit-Position: refs/heads/master@{#303014}

10 files changed, 98 insertions, 40 deletions

diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn
index 6bbbe6e..4a1e2da 100644
--- a/components/content_settings/core/browser/BUILD.gn
+++ b/components/content_settings/core/browser/BUILD.gn
@@ -48,6 +48,8 @@ source_set("unit_tests") {
 
   deps = [
     ":browser",
+    "//components/content_settings/core/test:test_support",
     "//testing/gtest",
   ]
 }
+
diff --git a/components/content_settings/core/browser/DEPS b/components/content_settings/core/browser/DEPS
index a69d8b3..dcf594c 100644
--- a/components/content_settings/core/browser/DEPS
+++ b/components/content_settings/core/browser/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/content_settings/core/test",
   "+components/pref_registry",
   "+net/base",
   "+net/cookies",
diff --git a/components/content_settings/core/browser/content_settings_provider_unittest.cc b/components/content_settings/core/browser/content_settings_provider_unittest.cc
index a9fda79..419c2d13 100644
--- a/components/content_settings/core/browser/content_settings_provider_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_provider_unittest.cc
@@ -5,6 +5,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "components/content_settings/core/browser/content_settings_mock_provider.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
+#include "components/content_settings/core/test/content_settings_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc
index 1a3f788..8dbf51d 100644
--- a/components/content_settings/core/browser/content_settings_utils.cc
+++ b/components/content_settings/core/browser/content_settings_utils.cc
@@ -216,30 +216,6 @@ base::Value* GetContentSettingValueAndPatterns(
   return NULL;
 }
 
-base::Value* GetContentSettingValue(const ProviderInterface* provider,
-                                    const GURL& primary_url,
-                                    const GURL& secondary_url,
-                                    ContentSettingsType content_type,
-                                    const std::string& resource_identifier,
-                                    bool include_incognito) {
-  return GetContentSettingValueAndPatterns(provider, primary_url, secondary_url,
-                               content_type, resource_identifier,
-                               include_incognito, NULL, NULL);
-}
-
-ContentSetting GetContentSetting(const ProviderInterface* provider,
-                                 const GURL& primary_url,
-                                 const GURL& secondary_url,
-                                 ContentSettingsType content_type,
-                                 const std::string& resource_identifier,
-                                 bool include_incognito) {
-  scoped_ptr<base::Value> value(
-      GetContentSettingValue(provider, primary_url, secondary_url,
-                             content_type, resource_identifier,
-                             include_incognito));
-  return ValueToContentSetting(value.get());
-}
-
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                     RendererContentSettingRules* rules) {
   map->GetSettingsForOneType(
diff --git a/components/content_settings/core/browser/content_settings_utils.h b/components/content_settings/core/browser/content_settings_utils.h
index 5aee075..2c8d093 100644
--- a/components/content_settings/core/browser/content_settings_utils.h
+++ b/components/content_settings/core/browser/content_settings_utils.h
@@ -68,22 +68,6 @@ base::Value* GetContentSettingValueAndPatterns(
     ContentSettingsPattern* primary_pattern,
     ContentSettingsPattern* secondary_pattern);
 
-base::Value* GetContentSettingValue(
-    const ProviderInterface* provider,
-    const GURL& primary_url,
-    const GURL& secondary_url,
-    ContentSettingsType content_type,
-    const std::string& resource_identifier,
-    bool include_incognito);
-
-ContentSetting GetContentSetting(
-    const ProviderInterface* provider,
-    const GURL& primary_url,
-    const GURL& secondary_url,
-    ContentSettingsType content_type,
-    const std::string& resource_identifier,
-    bool include_incognito);
-
 // Populates |rules| with content setting rules for content types that are
 // handled by the renderer.
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
diff --git a/components/content_settings/core/browser/content_settings_utils_unittest.cc b/components/content_settings/core/browser/content_settings_utils_unittest.cc
index 909a956..f89b45b 100644
--- a/components/content_settings/core/browser/content_settings_utils_unittest.cc
+++ b/components/content_settings/core/browser/content_settings_utils_unittest.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "components/content_settings/core/test/content_settings_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(ContentSettingsUtilsTest, ParsePatternString) {
diff --git a/components/content_settings/core/test/BUILD.gn b/components/content_settings/core/test/BUILD.gn
new file mode 100644
index 0000000..2c1316d
--- /dev/null
+++ b/components/content_settings/core/test/BUILD.gn
@@ -0,0 +1,21 @@
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+static_library("test_support") {
+  testonly = true
+  sources = [
+    "content_settings_test_utils.cc",
+    "content_settings_test_utils.h",
+  ]
+
+  public_deps = [
+    "//components/content_settings/core/browser",
+  ]
+  deps = [
+    "//base",
+    "//components/content_settings/core/common",
+    "//testing/gmock",
+    "//testing/gtest",
+  ]
+}
diff --git a/components/content_settings/core/test/DEPS b/components/content_settings/core/test/DEPS
new file mode 100644
index 0000000..f1b4a00
--- /dev/null
+++ b/components/content_settings/core/test/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+components/content_settings/core/browser",
+]
diff --git a/components/content_settings/core/test/content_settings_test_utils.cc b/components/content_settings/core/test/content_settings_test_utils.cc
new file mode 100644
index 0000000..320a19e
--- /dev/null
+++ b/components/content_settings/core/test/content_settings_test_utils.cc
@@ -0,0 +1,36 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "components/content_settings/core/test/content_settings_test_utils.h"
+
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
+#include "components/content_settings/core/common/content_settings_types.h"
+
+namespace content_settings {
+
+base::Value* GetContentSettingValue(const ProviderInterface* provider,
+                                    const GURL& primary_url,
+                                    const GURL& secondary_url,
+                                    ContentSettingsType content_type,
+                                    const std::string& resource_identifier,
+                                    bool include_incognito) {
+  return GetContentSettingValueAndPatterns(provider, primary_url, secondary_url,
+                                           content_type, resource_identifier,
+                                           include_incognito, NULL, NULL);
+}
+
+ContentSetting GetContentSetting(const ProviderInterface* provider,
+                                 const GURL& primary_url,
+                                 const GURL& secondary_url,
+                                 ContentSettingsType content_type,
+                                 const std::string& resource_identifier,
+                                 bool include_incognito) {
+  scoped_ptr<base::Value> value(
+      GetContentSettingValue(provider, primary_url, secondary_url, content_type,
+                             resource_identifier, include_incognito));
+  return ValueToContentSetting(value.get());
+}
+
+}  // namespace content_settings
diff --git a/components/content_settings/core/test/content_settings_test_utils.h b/components/content_settings/core/test/content_settings_test_utils.h
new file mode 100644
index 0000000..3e3fdb5
--- /dev/null
+++ b/components/content_settings/core/test/content_settings_test_utils.h
@@ -0,0 +1,33 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef COMPONENTS_CONTENT_SETTINGS_CORE_TEST_CONTENT_SETTINGS_TEST_UTILS_H_
+#define COMPONENTS_CONTENT_SETTINGS_CORE_TEST_CONTENT_SETTINGS_TEST_UTILS_H_
+
+#include "components/content_settings/core/browser/content_settings_utils.h"
+
+namespace content_settings {
+
+// The following two functions return the content setting (represented as
+// Value or directly the ContentSetting enum) from |provider| for the
+// given |content_type| and |resource_identifier|. The returned content setting
+// applies to the primary and secondary URL, and to the normal or incognito
+// mode, depending on |include_incognito|.
+base::Value* GetContentSettingValue(const ProviderInterface* provider,
+                                    const GURL& primary_url,
+                                    const GURL& secondary_url,
+                                    ContentSettingsType content_type,
+                                    const std::string& resource_identifier,
+                                    bool include_incognito);
+
+ContentSetting GetContentSetting(const ProviderInterface* provider,
+                                 const GURL& primary_url,
+                                 const GURL& secondary_url,
+                                 ContentSettingsType content_type,
+                                 const std::string& resource_identifier,
+                                 bool include_incognito);
+
+}  // namespace content_settings
+
+#endif  // COMPONENTS_CONTENT_SETTINGS_CORE_TEST_CONTENT_SETTINGS_TEST_UTILS_H_