Remove base::StringValue

chrome/browser/ui/webui/options/content_settings_handler.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/ui/webui/options/content_settings_handler.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 858 matching lines @@
          ++j) {
       // Skip the non-embedded setting which we already added above.
       if (j == parent)
         continue;
 
       exceptions.Append(GetGeolocationExceptionForPage(
           primary_pattern, j->first, j->second));
     }
   }
 
-  base::StringValue type_string(site_settings::ContentSettingsTypeToGroupName(
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
       CONTENT_SETTINGS_TYPE_GEOLOCATION));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
   // This is mainly here to keep this function ideologically parallel to
   // UpdateExceptionsViewFromHostContentSettingsMap().
   UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 void ContentSettingsHandler::UpdateNotificationExceptionsView() {
@@ skipping 19 matching lines @@
       continue;
     }
 
     exceptions.Append(
         GetNotificationExceptionForPage(i->primary_pattern,
                                         i->secondary_pattern,
                                         i->setting,
                                         i->source));
   }
 
-  base::StringValue type_string(site_settings::ContentSettingsTypeToGroupName(
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(
       CONTENT_SETTINGS_TYPE_NOTIFICATIONS));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
   // This is mainly here to keep this function ideologically parallel to
   // UpdateExceptionsViewFromHostContentSettingsMap().
   UpdateSettingDefaultFromModel(CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
 }
 
 void ContentSettingsHandler::CompareMediaExceptionsWithFlash(
@@ skipping 53 matching lines @@
   for (const site_settings::ChooserTypeNameEntry& chooser_type :
       site_settings::kChooserTypeGroupNames)
     UpdateOTRChooserExceptionsViewFromModel(chooser_type);
 }
 
 void ContentSettingsHandler::UpdateChooserExceptionsViewFromModel(
     const site_settings::ChooserTypeNameEntry& chooser_type) {
   base::ListValue exceptions;
   site_settings::GetChooserExceptionsFromProfile(
       Profile::FromWebUI(web_ui()), false, chooser_type, &exceptions);
-  base::StringValue type_string(chooser_type.name);
+  base::Value type_string(chooser_type.name);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
   UpdateOTRChooserExceptionsViewFromModel(chooser_type);
 }
 
 void ContentSettingsHandler::UpdateOTRChooserExceptionsViewFromModel(
     const site_settings::ChooserTypeNameEntry& chooser_type) {
   if (!Profile::FromWebUI(web_ui())->HasOffTheRecordProfile())
     return;
 
   base::ListValue exceptions;
   site_settings::GetChooserExceptionsFromProfile(
       Profile::FromWebUI(web_ui()), true, chooser_type, &exceptions);
-  base::StringValue type_string(chooser_type.name);
+  base::Value type_string(chooser_type.name);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",
                                          type_string, exceptions);
 }
 
 void ContentSettingsHandler::UpdateZoomLevelsExceptionsView() {
   base::ListValue zoom_levels_exceptions;
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetDefaultForBrowserContext(
           GetBrowserContext(web_ui()));
@@ skipping 44 matching lines @@
     // number.
     int zoom_percent = static_cast<int>(
         content::ZoomLevelToZoomFactor(i->zoom_level) * 100 + 0.5);
     exception->SetString(kZoom, base::FormatPercent(zoom_percent));
     exception->SetString(
         site_settings::kSource, site_settings::kPreferencesSource);
     // Append the new entry to the list and map.
     zoom_levels_exceptions.Append(std::move(exception));
   }
 
-  base::StringValue type_string(kZoomContentType);
+  base::Value type_string(kZoomContentType);
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, zoom_levels_exceptions);
 }
 
 void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap(
     ContentSettingsType type) {
   base::ListValue exceptions;
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
   const auto* extension_registry =
       extensions::ExtensionRegistry::Get(GetProfile());
   site_settings::GetExceptionsFromHostContentSettingsMap(
       settings_map, type, extension_registry, web_ui(), /*incognito=*/false,
       /*filter=*/nullptr, &exceptions);
-  base::StringValue type_string(
-      site_settings::ContentSettingsTypeToGroupName(type));
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
                                          type_string, exceptions);
 
   UpdateExceptionsViewFromOTRHostContentSettingsMap(type);
 
 #if defined(OS_CHROMEOS)
   // Also the default for protected contents is managed in another place.
   if (type == CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER)
     return;
 #endif
 
   // The default may also have changed (we won't get a separate notification).
   // If it hasn't changed, this call will be harmless.
   UpdateSettingDefaultFromModel(type);
 }
 
 void ContentSettingsHandler::UpdateExceptionsViewFromOTRHostContentSettingsMap(
     ContentSettingsType type) {
   const HostContentSettingsMap* otr_settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetOTRProfile());
   if (!otr_settings_map)
     return;
   const auto* extension_registry =
       extensions::ExtensionRegistry::Get(GetOTRProfile());
   base::ListValue exceptions;
   site_settings::GetExceptionsFromHostContentSettingsMap(
       otr_settings_map, type, extension_registry, web_ui(), /*incognito=*/true,
       /*filter=*/nullptr, &exceptions);
-  base::StringValue type_string(
-      site_settings::ContentSettingsTypeToGroupName(type));
+  base::Value type_string(site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",
                                          type_string, exceptions);
 }
 
 void ContentSettingsHandler::RemoveExceptionFromHostContentSettingsMap(
     const base::ListValue* args,
     ContentSettingsType type) {
   std::string mode;
   bool rv = args->GetString(1, &mode);
   DCHECK(rv);
@@ skipping 213 matching lines @@
   CHECK(args->GetString(0, &type_string));
   std::string mode_string;
   CHECK(args->GetString(1, &mode_string));
   std::string pattern_string;
   CHECK(args->GetString(2, &pattern_string));
 
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString(pattern_string);
 
   web_ui()->CallJavascriptFunctionUnsafe(
-      "ContentSettings.patternValidityCheckComplete",
-      base::StringValue(type_string), base::StringValue(mode_string),
-      base::StringValue(pattern_string), base::Value(pattern.IsValid()));
+      "ContentSettings.patternValidityCheckComplete", base::Value(type_string),
+      base::Value(mode_string), base::Value(pattern_string),
+      base::Value(pattern.IsValid()));
 }
 
 Profile* ContentSettingsHandler::GetProfile() {
   return Profile::FromWebUI(web_ui());
 }
 
 ProtocolHandlerRegistry* ContentSettingsHandler::GetProtocolHandlerRegistry() {
   return ProtocolHandlerRegistryFactory::GetForBrowserContext(
       GetBrowserContext(web_ui()));
 }
@@ skipping 40 matching lines @@
   MediaSettingsInfo::ForOneType& settings =
       media_settings_->forType(content_type);
 
   bool& show_link = link_type == DEFAULT_SETTING ?
       settings.show_flash_default_link :
       settings.show_flash_exceptions_link;
 
   if (show_link != show) {
     web_ui()->CallJavascriptFunctionUnsafe(
         "ContentSettings.showMediaPepperFlashLink",
-        base::StringValue(link_type == DEFAULT_SETTING ? "default"
-                                                       : "exceptions"),
-        base::StringValue(content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
-                              ? "mic"
-                              : "camera"),
+        base::Value(link_type == DEFAULT_SETTING ? "default" : "exceptions"),
+        base::Value(content_type == CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC
+                        ? "mic"
+                        : "camera"),
         base::Value(show));
     show_link = show;
   }
 }
 
 void ContentSettingsHandler::UpdateFlashMediaLinksVisibility(
     ContentSettingsType type) {
   MediaSettingsInfo::ForOneType& settings = media_settings_->forType(type);
   MediaSettingsInfo::ForFlash& flash_settings = media_settings_->forFlash();
 
@@ skipping 37 matching lines @@
     ShowFlashMediaLink(EXCEPTIONS, type, true);
   }
 }
 
 void ContentSettingsHandler::UpdateMediaDeviceDropdownVisibility(
     ContentSettingsType type) {
   MediaSettingsInfo::ForOneType& settings = media_settings_->forType(type);
 
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.setDevicesMenuVisibility",
-      base::StringValue(site_settings::ContentSettingsTypeToGroupName(type)),
+      base::Value(site_settings::ContentSettingsTypeToGroupName(type)),
       base::Value(!settings.policy_disable));
 }
 
 void ContentSettingsHandler::UpdateProtectedContentExceptionsButton() {
 #if defined(OS_CHROMEOS)
   // Guests cannot modify exceptions. UIAccountTweaks will disabled the button.
   if (user_manager::UserManager::Get()->IsLoggedInAsGuest())
     return;
 #endif
 
   // Exceptions apply only when the feature is enabled.
   PrefService* prefs = user_prefs::UserPrefs::Get(GetBrowserContext(web_ui()));
   bool enable_exceptions = prefs->GetBoolean(prefs::kEnableDRM);
   web_ui()->CallJavascriptFunctionUnsafe(
       "ContentSettings.enableProtectedContentExceptions",
       base::Value(enable_exceptions));
 }
 
 }  // namespace options