Migrate geolocation settings to host content settings map.

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2011 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/host_content_settings_map.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 40 matching lines @@
     DefaultProviderIterator;
 typedef std::vector<DefaultContentSettingsProviderPtr>::const_iterator
     ConstDefaultProviderIterator;
 
 typedef linked_ptr<content_settings::ProviderInterface> ProviderPtr;
 typedef std::vector<ProviderPtr>::iterator ProviderIterator;
 typedef std::vector<ProviderPtr>::const_iterator ConstProviderIterator;
 
 typedef content_settings::ProviderInterface::Rules Rules;
 
+typedef std::pair<std::string, std::string> StringPair;
+
 const char* kProviderNames[] = {
   "policy",
   "extension",
   "preference"
 };
 
 }  // namespace
 
 HostContentSettingsMap::HostContentSettingsMap(
     PrefService* prefs,
@@ skipping 233 matching lines @@
             resource_identifier.empty());
   DCHECK(settings);
 
   settings->clear();
   for (size_t i = 0; i < content_settings_providers_.size(); ++i) {
     // Get rules from the content settings provider.
     Rules rules;
     content_settings_providers_[i]->GetAllContentSettingsRules(
         content_type, resource_identifier, &rules);
 
-    // Sort rules according to their primary pattern string using a map.
-    std::map<std::string, PatternSettingSourceTuple> settings_map;
+    // Sort rules according to their primary-secondary pattern string pairs
+    // using a map.
+    std::map<StringPair, PatternSettingSourceTuple> settings_map;
     for (Rules::iterator rule = rules.begin();
          rule != rules.end();
          ++rule) {
-      // We do not support pattern pairs in the UI, so we only display the
-      // primary pattern.
-      std::string sort_key = rule->primary_pattern.ToString();
+      StringPair sort_key(rule->primary_pattern.ToString(),
+                          rule->secondary_pattern.ToString());
       settings_map[sort_key] = PatternSettingSourceTuple(
           rule->primary_pattern,
           rule->secondary_pattern,
           rule->content_setting,
           kProviderNames[i]);
     }
 
     // TODO(markusheintz): Only the rules that are applied should be added.
-    for (std::map<std::string, PatternSettingSourceTuple>::iterator i(
+    for (std::map<StringPair, PatternSettingSourceTuple>::iterator i(
              settings_map.begin());
          i != settings_map.end();
          ++i) {
       settings->push_back(i->second);
     }
   }
 }
 
 void HostContentSettingsMap::SetDefaultContentSetting(
     ContentSettingsType content_type,
@@ skipping 193 matching lines @@
         SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
             (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
                 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
     }
     if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
       SetBlockThirdPartyCookies(cookie_behavior ==
           net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
     }
   }
 }