Merge 106270 - Check for default content settings when requiring user authorization for plug-ins.

chrome/browser/extensions/extension_content_settings_store_unittest.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/extensions/extension_content_settings_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 33 matching lines @@
 };
 
 ContentSetting GetContentSettingFromStore(
     const ExtensionContentSettingsStore* store,
     const GURL& primary_url, const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool incognito) {
   scoped_ptr<content_settings::RuleIterator> rule_iterator (
       store->GetRuleIterator(content_type, resource_identifier, incognito));
-  return content_settings::GetContentSetting(
-      rule_iterator.get(), primary_url, secondary_url);
+  scoped_ptr<base::Value> setting(
+      content_settings::GetContentSettingValueAndPatterns(
+          rule_iterator.get(), primary_url, secondary_url, NULL, NULL));
+  return content_settings::ValueToContentSetting(setting.get());
 }
 
 void GetSettingsForOneTypeFromStore(
     const ExtensionContentSettingsStore* store,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool incognito,
     std::vector<content_settings::Rule>* rules) {
   rules->clear();
   scoped_ptr<content_settings::RuleIterator> rule_iterator(
@@ skipping 174 matching lines @@
   ASSERT_EQ(1u, rules.size());
   CheckRule(rules[0], pattern_2, pattern_2, CONTENT_SETTING_BLOCK);
 
   // Uninstall second extension.
   store()->UnregisterExtension(ext_id_2);
 
   GetSettingsForOneTypeFromStore(
       store(), CONTENT_SETTINGS_TYPE_COOKIES, "", incognito, &rules);
   ASSERT_EQ(0u, rules.size());
 }