Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/browser/content_settings/content_settings_utils.cc

 // 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 "chrome/browser/content_settings/content_settings_utils.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_provider.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
+#include "chrome/common/chrome_content_settings_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/content_settings_pattern.h"
 #include "url/gurl.h"
 
 namespace {
 
 // The names of the ContentSettingsType values, for use with dictionary prefs.
 const char* kTypeNames[] = {
   "cookies",
   "images",
@@ skipping 44 matching lines @@
       *return_setting = static_cast<ContentSettingsType>(type);
       return true;
     }
   }
   return false;
 }
 
 std::string CreatePatternString(
     const ContentSettingsPattern& item_pattern,
     const ContentSettingsPattern& top_level_frame_pattern) {
-  return item_pattern.ToString()
+  content_settings::ChromeContentSettingsClient client;
+  return item_pattern.ToString(&client)
          + std::string(kPatternSeparator)
-         + top_level_frame_pattern.ToString();
+         + top_level_frame_pattern.ToString(&client);
 }
 
 PatternPair ParsePatternString(const std::string& pattern_str) {
   std::vector<std::string> pattern_str_list;
   base::SplitString(pattern_str, kPatternSeparator[0], &pattern_str_list);
 
   // If the |pattern_str| is an empty string then the |pattern_string_list|
   // contains a single empty string. In this case the empty string will be
   // removed to signal an invalid |pattern_str|. Invalid pattern strings are
   // handle by the "if"-statment below. So the order of the if statements here
   // must be preserved.
   if (pattern_str_list.size() == 1) {
     if (pattern_str_list[0].empty()) {
       pattern_str_list.pop_back();
     } else {
       pattern_str_list.push_back("*");
     }
   }
 
   if (pattern_str_list.size() > 2 ||
       pattern_str_list.size() == 0) {
     return PatternPair(ContentSettingsPattern(),
                        ContentSettingsPattern());
   }
 
+  content_settings::ChromeContentSettingsClient client;
   PatternPair pattern_pair;
   pattern_pair.first =
-      ContentSettingsPattern::FromString(pattern_str_list[0]);
+      ContentSettingsPattern::FromString(&client, pattern_str_list[0]);
   pattern_pair.second =
-      ContentSettingsPattern::FromString(pattern_str_list[1]);
+      ContentSettingsPattern::FromString(&client, pattern_str_list[1]);
   return pattern_pair;
 }
 
 ContentSetting ValueToContentSetting(const base::Value* value) {
   ContentSetting setting = CONTENT_SETTING_DEFAULT;
   bool valid = ParseContentSettingValue(value, &setting);
   DCHECK(valid);
   return setting;
 }
 
@@ skipping 85 matching lines @@
 
 void GetRendererContentSettingRules(const HostContentSettingsMap* map,
                                     RendererContentSettingRules* rules) {
   map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_IMAGES, std::string(), &(rules->image_rules));
   map->GetSettingsForOneType(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, std::string(), &(rules->script_rules));
 }
 
 }  // namespace content_settings