Remove base::StringValue

chrome/browser/ui/webui/settings/reset_settings_handler.cc

 // Copyright 2013 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/settings/reset_settings_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 139 matching lines @@
                                             send_settings, request_origin));
   } else {
     ResetProfile(callback_id, send_settings, request_origin);
   }
 }
 
 void ResetSettingsHandler::OnResetProfileSettingsDone(
     std::string callback_id,
     bool send_feedback,
     reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
-  ResolveJavascriptCallback(
-      base::StringValue(callback_id), *base::Value::CreateNullValue());
+  ResolveJavascriptCallback(base::Value(callback_id),
+                            *base::Value::CreateNullValue());
   if (send_feedback && setting_snapshot_) {
     ResettableSettingsSnapshot current_snapshot(profile_);
     int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
     if (difference) {
       setting_snapshot_->Subtract(current_snapshot);
       std::unique_ptr<reset_report::ChromeResetReport> report_proto =
           SerializeSettingsReportToProto(*setting_snapshot_, difference);
       if (report_proto) {
         report_proto->set_reset_request_origin(request_origin);
         SendSettingsFeedbackProto(*report_proto, profile_);
@@ skipping 13 matching lines @@
 
   setting_snapshot_->RequestShortcuts(base::Bind(
       &ResetSettingsHandler::OnGetReportedSettingsDone,
       weak_ptr_factory_.GetWeakPtr(),
       callback_id));
 }
 
 void ResetSettingsHandler::OnGetReportedSettingsDone(std::string callback_id) {
   std::unique_ptr<base::ListValue> list =
       GetReadableFeedbackForSnapshot(profile_, *setting_snapshot_);
-  ResolveJavascriptCallback(base::StringValue(callback_id), *list);
+  ResolveJavascriptCallback(base::Value(callback_id), *list);
 }
 
 void ResetSettingsHandler::OnShowResetProfileDialog(
     const base::ListValue* args) {
   if (!GetResetter()->IsActive()) {
     setting_snapshot_.reset(new ResettableSettingsSnapshot(profile_));
   }
 
   if (brandcode_.empty())
     return;
@@ skipping 81 matching lines @@
     // Now that a reset UI has been shown, don't trigger again for this profile.
     triggered_profile_resetter->ClearResetTrigger();
   }
 #endif  // defined(OS_WIN)
 
   if (reset_tool_name.empty()) {
     reset_tool_name = l10n_util::GetStringUTF16(
         IDS_TRIGGERED_RESET_PROFILE_SETTINGS_DEFAULT_TOOL_NAME);
   }
 
-  base::StringValue string_value(reset_tool_name);
+  base::Value string_value(reset_tool_name);
   ResolveJavascriptCallback(*callback_id, string_value);
 }
 
 #if defined(OS_CHROMEOS)
 void ResetSettingsHandler::OnShowPowerwashDialog(
      const base::ListValue* args) {
   UMA_HISTOGRAM_ENUMERATION(
       "Reset.ChromeOS.PowerwashDialogShown",
       chromeos::reset::DIALOG_FROM_OPTIONS,
       chromeos::reset::DIALOG_VIEW_TYPE_SIZE);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace settings