Clean content_settings_pattern_parser.* from unnecessary dependencies.

chrome/browser/extensions/api/content_settings/content_settings_store.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/extensions/api/content_settings/content_settings_store.h"
 
 #include <set>
 
 #include "base/debug/alias.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_origin_identifier_value_map.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
 #include "chrome/browser/extensions/api/content_settings/content_settings_helpers.h"
+#include "chrome/common/chrome_content_settings_client.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 using content_settings::ConcatenationIterator;
 using content_settings::Rule;
 using content_settings::RuleIterator;
 using content_settings::OriginIdentifierValueMap;
 using content_settings::ResourceIdentifier;
 using content_settings::ValueToContentSetting;
 
@@ skipping 222 matching lines @@
   base::ListValue* settings = new base::ListValue();
   OriginIdentifierValueMap::EntryMap::const_iterator it;
   for (it = map->begin(); it != map->end(); ++it) {
     scoped_ptr<RuleIterator> rule_iterator(
         map->GetRuleIterator(it->first.content_type,
                              it->first.resource_identifier,
                              NULL));  // We already hold the lock.
     while (rule_iterator->HasNext()) {
       const Rule& rule = rule_iterator->Next();
       base::DictionaryValue* setting_dict = new base::DictionaryValue();
+      content_settings::ChromeContentSettingsClient client;
       setting_dict->SetString(keys::kPrimaryPatternKey,
-                              rule.primary_pattern.ToString());
+                              rule.primary_pattern.ToString(&client));
       setting_dict->SetString(keys::kSecondaryPatternKey,
-                              rule.secondary_pattern.ToString());
+                              rule.secondary_pattern.ToString(&client));
       setting_dict->SetString(
           keys::kContentSettingsTypeKey,
           helpers::ContentSettingsTypeToString(it->first.content_type));
       setting_dict->SetString(keys::kResourceIdentifierKey,
                               it->first.resource_identifier);
       ContentSetting content_setting = ValueToContentSetting(rule.value.get());
       DCHECK_NE(CONTENT_SETTING_DEFAULT, content_setting);
       setting_dict->SetString(
           keys::kContentSettingKey,
           helpers::ContentSettingToString(content_setting));
       settings->Append(setting_dict);
     }
   }
   return settings;
 }
 
 void ContentSettingsStore::SetExtensionContentSettingFromList(
     const std::string& extension_id,
     const base::ListValue* list,
     ExtensionPrefsScope scope) {
   for (base::ListValue::const_iterator it = list->begin();
        it != list->end(); ++it) {
     if ((*it)->GetType() != base::Value::TYPE_DICTIONARY) {
       NOTREACHED();
       continue;
     }
     base::DictionaryValue* dict = static_cast<base::DictionaryValue*>(*it);
     std::string primary_pattern_str;
     dict->GetString(keys::kPrimaryPatternKey, &primary_pattern_str);
+    content_settings::ChromeContentSettingsClient client;
     ContentSettingsPattern primary_pattern =
-        ContentSettingsPattern::FromString(primary_pattern_str);
+        ContentSettingsPattern::FromString(&client, primary_pattern_str);
     DCHECK(primary_pattern.IsValid());
 
     std::string secondary_pattern_str;
     dict->GetString(keys::kSecondaryPatternKey, &secondary_pattern_str);
     ContentSettingsPattern secondary_pattern =
-        ContentSettingsPattern::FromString(secondary_pattern_str);
+        ContentSettingsPattern::FromString(&client, secondary_pattern_str);
     DCHECK(secondary_pattern.IsValid());
 
     std::string content_settings_type_str;
     dict->GetString(keys::kContentSettingsTypeKey, &content_settings_type_str);
     ContentSettingsType content_settings_type =
         helpers::StringToContentSettingsType(content_settings_type_str);
     DCHECK_NE(CONTENT_SETTINGS_TYPE_DEFAULT, content_settings_type);
 
     std::string resource_identifier;
     dict->GetString(keys::kResourceIdentifierKey, &resource_identifier);
@@ skipping 54 matching lines @@
 ContentSettingsStore::FindEntry(const std::string& ext_id) const {
   ExtensionEntryMap::const_iterator i;
   for (i = entries_.begin(); i != entries_.end(); ++i) {
     if (i->second->id == ext_id)
       return i;
   }
   return entries_.end();
 }
 
 }  // namespace extensions