Get rid of some uses of CreateIntegerValue

chrome/browser/content_settings/content_settings_pref_provider_unittest.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_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 105 matching lines @@
                                       CONTENT_SETTINGS_TYPE_IMAGES,
                                       ""));
 
   pref_content_settings_provider.AddObserver(&mock_observer);
 
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
-      base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+      new base::FundamentalValue(CONTENT_SETTING_ALLOW));
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 // Test for regression in which the PrefProvider modified the user pref store
 // of the OTR unintentionally: http://crbug.com/74466.
 TEST_F(PrefProviderTest, Incognito) {
   PersistentPrefStore* user_prefs = new TestingPrefStore();
   OverlayUserPrefStore* otr_user_prefs =
       new OverlayUserPrefStore(user_prefs);
@@ skipping 28 matching lines @@
 
   PrefProvider pref_content_settings_provider(regular_prefs, false);
   PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
-      base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+      new base::FundamentalValue(CONTENT_SETTING_ALLOW));
 
   GURL host("http://example.com/");
   // The value should of course be visible in the regular PrefProvider.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&pref_content_settings_provider,
                               host,
                               host,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
@@ skipping 34 matching lines @@
                                    primary_url,
                                    primary_url,
                                    CONTENT_SETTINGS_TYPE_IMAGES,
                                    std::string(),
                                    false));
 
   provider.SetWebsiteSetting(primary_pattern,
                              primary_pattern,
                              CONTENT_SETTINGS_TYPE_IMAGES,
                              std::string(),
-                             base::Value::CreateIntegerValue(
-                                 CONTENT_SETTING_BLOCK));
+                             new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider,
                               primary_url,
                               primary_url,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
   scoped_ptr<base::Value> value_ptr(
       GetContentSettingValue(&provider,
                              primary_url,
@@ skipping 41 matching lines @@
                               host1,
                               host1,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern1,
       pattern1,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
-      base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&pref_content_settings_provider,
                               host1,
                               host1,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&pref_content_settings_provider,
                               host2,
                               host2,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(&pref_content_settings_provider,
                               host3,
                               host3,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern2,
       pattern2,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
-      base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&pref_content_settings_provider,
                               host3,
                               host3,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(&pref_content_settings_provider,
                               host4,
                               host4,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern3,
       pattern3,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
-      base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&pref_content_settings_provider,
                               host4,
                               host4,
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
                               false));
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
@@ skipping 12 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
                 resource1, false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS,
       resource1,
-      base::Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
+      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
                 resource1, false));
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
                 resource2, false));
@@ skipping 11 matching lines @@
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(
                 &provider,
                 primary_url,
                 primary_url,
                 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
                 std::string(),
                 false));
 
-  provider.SetWebsiteSetting(
-      ContentSettingsPattern::FromURL(primary_url),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
-      std::string(),
-      base::Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+  provider.SetWebsiteSetting(ContentSettingsPattern::FromURL(primary_url),
+                             ContentSettingsPattern::Wildcard(),
+                             CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
+                             std::string(),
+                             new base::FundamentalValue(CONTENT_SETTING_ALLOW));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(
                 &provider,
                 primary_url,
                 secondary_url,
                 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
                 std::string(),
                 false));
   provider.ShutdownOnUIThread();
 }
@@ skipping 51 matching lines @@
   base::Time second = pref_content_settings_provider.GetLastUsage(
       pattern, pattern, CONTENT_SETTINGS_TYPE_GEOLOCATION);
 
   base::TimeDelta delta = second - first;
   EXPECT_EQ(delta.InSeconds(), 10);
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings