Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/browser/content_settings/content_settings_pref_provider_unittest.cc

Index: chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
index 9ad8bfbe544b220ec2b028455a1fb93670b569d7..19d3b1b4e8825a727bb01cfb0ff6767e2ce3606e 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc
@@ -22,6 +22,7 @@
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service_mock_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
+#include "chrome/common/chrome_content_settings_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
@@ -98,9 +99,14 @@ class PrefProviderTest : public testing::Test {
       BrowserThread::UI, &message_loop_) {
   }
 
+  content_settings::ContentSettingsClient* client() {
+    return &client_;
+  }
+
  protected:
   base::MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
+  content_settings::ChromeContentSettingsClient client_;
 };
 
 TEST_F(PrefProviderTest, Observer) {
@@ -108,7 +114,7 @@ TEST_F(PrefProviderTest, Observer) {
   PrefProvider pref_content_settings_provider(profile.GetPrefs(), false);
 
   ContentSettingsPattern pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString(client(), "[*.]example.com");
   content_settings::MockObserver mock_observer;
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(pattern,
@@ -166,7 +172,7 @@ TEST_F(PrefProviderTest, Incognito) {
   PrefProvider pref_content_settings_provider(regular_prefs, false);
   PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);
   ContentSettingsPattern pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString(client(), "[*.]example.com");
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
@@ -205,7 +211,7 @@ TEST_F(PrefProviderTest, GetContentSettingsValue) {
 
   GURL primary_url("http://example.com/");
   ContentSettingsPattern primary_pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString(client(), "[*.]example.com");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(&provider,
@@ -271,11 +277,11 @@ TEST_F(PrefProviderTest, Patterns) {
   GURL host3("http://example.org/");
   GURL host4("file:///tmp/test.html");
   ContentSettingsPattern pattern1 =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString(client(), "[*.]example.com");
   ContentSettingsPattern pattern2 =
-      ContentSettingsPattern::FromString("example.org");
+      ContentSettingsPattern::FromString(client(), "example.org");
   ContentSettingsPattern pattern3 =
-      ContentSettingsPattern::FromString("file:///tmp/test.html");
+      ContentSettingsPattern::FromString(client(), "file:///tmp/test.html");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(&pref_content_settings_provider,
@@ -357,7 +363,7 @@ TEST_F(PrefProviderTest, ResourceIdentifier) {
 
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString(client(), "[*.]example.com");
   std::string resource1("someplugin");
   std::string resource2("otherplugin");
 
@@ -454,7 +460,7 @@ TEST_F(PrefProviderTest, LastUsage) {
       scoped_ptr<base::Clock>(test_clock));
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
-      ContentSettingsPattern::FromString("[*.]example.com");
+      ContentSettingsPattern::FromString(client(), "[*.]example.com");
 
   base::Time no_usage = pref_content_settings_provider.GetLastUsage(
       pattern, pattern, CONTENT_SETTINGS_TYPE_GEOLOCATION);