Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc

Index: chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
diff --git a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
index ce9295c3c68b57997bd87cc2765a44072eb56a03..f1ff80163bb9e63283387fd640df668705c2d670 100644
--- a/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
+++ b/chrome/browser/ui/webui/options/pepper_flash_content_settings_utils_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/ui/webui/options/pepper_flash_content_settings_utils.h"
 
 #include "base/basictypes.h"
+#include "chrome/common/chrome_content_settings_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using options::MediaException;
@@ -22,9 +23,12 @@ MediaExceptions ConvertAndSort(const MediaException* items, size_t count) {
 }  // namespace
 
 TEST(PepperFlashContentSettingsUtilsTest, SortMediaExceptions) {
-  MediaException entry_1(ContentSettingsPattern::FromString("www.google.com"),
+  content_settings::ChromeContentSettingsClient client;
+  MediaException entry_1(ContentSettingsPattern::FromString(&client,
+                                                            "www.google.com"),
                          CONTENT_SETTING_ALLOW, CONTENT_SETTING_ASK);
-  MediaException entry_2(ContentSettingsPattern::FromString("www.youtube.com"),
+  MediaException entry_2(ContentSettingsPattern::FromString(&client,
+                                                            "www.youtube.com"),
                          CONTENT_SETTING_BLOCK, CONTENT_SETTING_DEFAULT);
   MediaException entry_3(ContentSettingsPattern::Wildcard(),
                          CONTENT_SETTING_ASK, CONTENT_SETTING_BLOCK);
@@ -75,16 +79,20 @@ TEST(PepperFlashContentSettingsUtilsTest, AreMediaExceptionsEqual) {
         false));
   }
 
+  content_settings::ChromeContentSettingsClient client;
   {
     MediaException exceptions_1[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW),
-      MediaException(ContentSettingsPattern::FromString("www.youtube.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.youtube.com"),
                      CONTENT_SETTING_ASK, CONTENT_SETTING_ASK)
     };
 
     MediaException exceptions_2[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
@@ -118,14 +126,17 @@ TEST(PepperFlashContentSettingsUtilsTest, AreMediaExceptionsEqual) {
     // Similar to the previous block, but reoder the exceptions. The outcome
     // should be the same.
     MediaException exceptions_1[] = {
-      MediaException(ContentSettingsPattern::FromString("www.youtube.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.youtube.com"),
                      CONTENT_SETTING_ASK, CONTENT_SETTING_ASK),
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
     MediaException exceptions_2[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
@@ -147,12 +158,14 @@ TEST(PepperFlashContentSettingsUtilsTest, AreMediaExceptionsEqual) {
 
   {
     MediaException exceptions_1[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_BLOCK)
     };
 
     MediaException exceptions_2[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };
 
@@ -175,12 +188,14 @@ TEST(PepperFlashContentSettingsUtilsTest, AreMediaExceptionsEqual) {
 
   {
     MediaException exceptions_1[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_BLOCK, CONTENT_SETTING_ALLOW)
     };
 
     MediaException exceptions_2[] = {
-      MediaException(ContentSettingsPattern::FromString("www.google.com"),
+      MediaException(ContentSettingsPattern::FromString(&client,
+                                                        "www.google.com"),
                      CONTENT_SETTING_ALLOW, CONTENT_SETTING_ALLOW)
     };