Cleanup content settings code

chrome/browser/content_settings/content_settings_provider_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 "testing/gtest/include/gtest/gtest.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/content_settings/content_settings_mock_provider.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "googleurl/src/gurl.h"
 
 namespace content_settings {
 
 TEST(ContentSettingsProviderTest, Mock) {
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]youtube.com");
   GURL url("http://www.youtube.com");
 
-  MockProvider mock_provider(
+  MockProvider mock_provider(false);
+  mock_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS,
       "java_plugin",
-      CONTENT_SETTING_BLOCK,
-      false,
-      false);
+      Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&mock_provider, url, url,
                               CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin",
                               false));
   scoped_ptr<Value> value_ptr(
             GetContentSettingValue(&mock_provider, url, url,
                                    CONTENT_SETTINGS_TYPE_PLUGINS,
                                    "java_plugin", false));
   int int_value = -1;
@@ skipping 53 matching lines @@
       "java_plugin",
       Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
   EXPECT_TRUE(owned);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&mock_provider, url, url,
                               CONTENT_SETTINGS_TYPE_PLUGINS, "java_plugin",
                               false));
 }
 
 }  // namespace content_settings