Remove base::FundamentalValue

chrome/browser/content_settings/content_settings_default_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 <memory>
 
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 25 matching lines @@
   TestingProfile profile_;
   DefaultProvider provider_;
 };
 
 TEST_F(DefaultProviderTest, DefaultValues) {
   // Check setting defaults.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             TestUtils::GetContentSetting(&provider_, GURL(), GURL(),
                                          CONTENT_SETTINGS_TYPE_COOKIES,
                                          std::string(), false));
-  provider_.SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_COOKIES,
-      std::string(),
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
+                              ContentSettingsPattern::Wildcard(),
+                              CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
+                              new base::Value(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(&provider_, GURL(), GURL(),
                                          CONTENT_SETTINGS_TYPE_COOKIES,
                                          std::string(), false));
 
   EXPECT_EQ(CONTENT_SETTING_ASK,
             TestUtils::GetContentSetting(&provider_, GURL(), GURL(),
                                          CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                          std::string(), false));
-  provider_.SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
+                              ContentSettingsPattern::Wildcard(),
+                              CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
+                              new base::Value(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(&provider_, GURL(), GURL(),
                                          CONTENT_SETTINGS_TYPE_GEOLOCATION,
                                          std::string(), false));
 
   std::unique_ptr<base::Value> value(TestUtils::GetContentSettingValue(
       &provider_, GURL("http://example.com/"), GURL("http://example.com/"),
       CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE, std::string(), false));
   EXPECT_FALSE(value.get());
 }
 
 TEST_F(DefaultProviderTest, IgnoreNonDefaultSettings) {
   GURL primary_url("http://www.google.com");
   GURL secondary_url("http://www.google.com");
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             TestUtils::GetContentSetting(&provider_, primary_url, secondary_url,
                                          CONTENT_SETTINGS_TYPE_COOKIES,
                                          std::string(), false));
-  std::unique_ptr<base::Value> value(
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  std::unique_ptr<base::Value> value(new base::Value(CONTENT_SETTING_BLOCK));
   bool owned = provider_.SetWebsiteSetting(
       ContentSettingsPattern::FromURL(primary_url),
       ContentSettingsPattern::FromURL(secondary_url),
       CONTENT_SETTINGS_TYPE_COOKIES,
       std::string(),
       value.get());
   EXPECT_FALSE(owned);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             TestUtils::GetContentSetting(&provider_, primary_url, secondary_url,
                                          CONTENT_SETTINGS_TYPE_COOKIES,
                                          std::string(), false));
 }
 
 TEST_F(DefaultProviderTest, Observer) {
   MockObserver mock_observer;
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(
                   _, _, CONTENT_SETTINGS_TYPE_COOKIES, ""));
   provider_.AddObserver(&mock_observer);
-  provider_.SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_COOKIES,
-      std::string(),
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
+                              ContentSettingsPattern::Wildcard(),
+                              CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
+                              new base::Value(CONTENT_SETTING_BLOCK));
 
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(
                   _, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
-  provider_.SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_GEOLOCATION,
-      std::string(),
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
+                              ContentSettingsPattern::Wildcard(),
+                              CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(),
+                              new base::Value(CONTENT_SETTING_BLOCK));
 }
 
 
 TEST_F(DefaultProviderTest, ObservePref) {
   PrefService* prefs = profile_.GetPrefs();
 
-  provider_.SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_COOKIES,
-      std::string(),
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
+                              ContentSettingsPattern::Wildcard(),
+                              CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
+                              new base::Value(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(&provider_, GURL(), GURL(),
                                          CONTENT_SETTINGS_TYPE_COOKIES,
                                          std::string(), false));
   const WebsiteSettingsInfo* info = WebsiteSettingsRegistry::GetInstance()->Get(
       CONTENT_SETTINGS_TYPE_COOKIES);
   // Clearing the backing pref should also clear the internal cache.
   prefs->ClearPref(info->default_value_pref_name());
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             TestUtils::GetContentSetting(&provider_, GURL(), GURL(),
@@ skipping 46 matching lines @@
             TestUtils::GetContentSetting(
                 &provider_, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), false /* include_incognito */));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             TestUtils::GetContentSetting(
                 &otr_provider, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), true /* include_incognito */));
 
   // Changing content settings on the main provider should also affect the
   // incognito map.
-  provider_.SetWebsiteSetting(
-      ContentSettingsPattern::Wildcard(),
-      ContentSettingsPattern::Wildcard(),
-      CONTENT_SETTINGS_TYPE_COOKIES,
-      std::string(),
-      new base::FundamentalValue(CONTENT_SETTING_BLOCK));
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
+                              ContentSettingsPattern::Wildcard(),
+                              CONTENT_SETTINGS_TYPE_COOKIES, std::string(),
+                              new base::Value(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(
                 &provider_, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), false /* include_incognito */));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(
                 &otr_provider, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), true /* include_incognito */));
 
   // Changing content settings on the incognito provider should be ignored.
-  std::unique_ptr<base::Value> value(
-      new base::FundamentalValue(CONTENT_SETTING_ALLOW));
+  std::unique_ptr<base::Value> value(new base::Value(CONTENT_SETTING_ALLOW));
   bool owned = otr_provider.SetWebsiteSetting(
       ContentSettingsPattern::Wildcard(),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES,
       std::string(),
       value.release());
   EXPECT_TRUE(owned);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(
                 &provider_, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), false /* include_incognito */));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(
                 &otr_provider, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), true /* include_incognito */));
 
   // Check that new OTR DefaultProviders also inherit the correct value.
   DefaultProvider otr_provider2(profile_.GetPrefs(), true /* incognito */);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             TestUtils::GetContentSetting(
                 &otr_provider2, GURL(), GURL(), CONTENT_SETTINGS_TYPE_COOKIES,
                 std::string(), true /* include_incognito */));
 
   otr_provider.ShutdownOnUIThread();
   otr_provider2.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings