Remove base::StringValue

chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc

 // Copyright 2015 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/chromeos/change_picture_handler.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 126 matching lines @@
                           l10n_util::GetStringUTF16(
                               default_user_image::kDefaultImageAuthorIDs[i]));
     image_data->SetString("website",
                           l10n_util::GetStringUTF16(
                               default_user_image::kDefaultImageWebsiteIDs[i]));
     image_data->SetString("title",
                           default_user_image::GetDefaultImageDescription(i));
     image_urls.Append(std::move(image_data));
   }
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("default-images-changed"),
-                         image_urls);
+                         base::Value("default-images-changed"), image_urls);
 }
 
 void ChangePictureHandler::HandleChooseFile(const base::ListValue* args) {
   DCHECK(args && args->empty());
   select_file_dialog_ = ui::SelectFileDialog::Create(
       this, new ChromeSelectFilePolicy(web_ui()->GetWebContents()));
 
   base::FilePath downloads_path;
   if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_path)) {
     NOTREACHED();
@@ skipping 64 matching lines @@
       // User has their Profile image as the current image.
       SendProfileImage(user->GetImage(), true);
       break;
     }
     default: {
       DCHECK(previous_image_index_ >= 0 &&
              previous_image_index_ < default_user_image::kDefaultImagesCount);
       if (previous_image_index_ >=
           default_user_image::kFirstDefaultImageIndex) {
         // User has image from the current set of default images.
-        base::StringValue image_url(
+        base::Value image_url(
             default_user_image::GetDefaultImageUrl(previous_image_index_));
         CallJavascriptFunction("cr.webUIListenerCallback",
-                               base::StringValue("selected-image-changed"),
+                               base::Value("selected-image-changed"),
                                image_url);
       } else {
         // User has an old default image, so present it in the same manner as a
         // previous image from file.
         SendOldImage(
             default_user_image::GetDefaultImageUrl(previous_image_index_));
       }
     }
   }
 }
 
 void ChangePictureHandler::SendProfileImage(const gfx::ImageSkia& image,
                                             bool should_select) {
-  base::StringValue data_url(webui::GetBitmapDataUrl(*image.bitmap()));
+  base::Value data_url(webui::GetBitmapDataUrl(*image.bitmap()));
   base::Value select(should_select);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("profile-image-changed"), data_url,
+                         base::Value("profile-image-changed"), data_url,
                          select);
 }
 
 void ChangePictureHandler::UpdateProfileImage() {
   UserImageManager* user_image_manager =
       ChromeUserManager::Get()->GetUserImageManager(GetUser()->GetAccountId());
   // If we have a downloaded profile image and haven't sent it in
   // |SendSelectedImage|, send it now (without selecting).
   if (previous_image_index_ != user_manager::User::USER_IMAGE_PROFILE &&
       !user_image_manager->DownloadedProfileImage().isNull())
     SendProfileImage(user_image_manager->DownloadedProfileImage(), false);
 
   user_image_manager->DownloadProfileImage(kProfileDownloadReason);
 }
 
 void ChangePictureHandler::SendOldImage(const std::string& image_url) {
   previous_image_url_ = image_url;
-  base::StringValue url(image_url);
+  base::Value url(image_url);
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("old-image-changed"), url);
+                         base::Value("old-image-changed"), url);
 }
 
 void ChangePictureHandler::HandleSelectImage(const base::ListValue* args) {
   std::string image_url;
   std::string image_type;
   if (!args || args->GetSize() != 2 || !args->GetString(0, &image_url) ||
       !args->GetString(1, &image_type)) {
     NOTREACHED();
     return;
   }
@@ skipping 77 matching lines @@
       ->SaveUserImage(user_manager::UserImage::CreateAndEncode(
           photo, user_manager::UserImage::FORMAT_JPEG));
   UMA_HISTOGRAM_ENUMERATION("UserImage.ChangeChoice",
                             default_user_image::kHistogramImageFromCamera,
                             default_user_image::kHistogramImagesCount);
   VLOG(1) << "Selected camera photo";
 }
 
 void ChangePictureHandler::SetCameraPresent(bool present) {
   CallJavascriptFunction("cr.webUIListenerCallback",
-                         base::StringValue("camera-presence-changed"),
+                         base::Value("camera-presence-changed"),
                          base::Value(present));
 }
 
 void ChangePictureHandler::OnCameraPresenceCheckDone(bool is_camera_present) {
   SetCameraPresent(is_camera_present);
 }
 
 void ChangePictureHandler::OnUserImageChanged(const user_manager::User& user) {
   // Not initialized yet.
   if (previous_image_index_ == user_manager::User::USER_IMAGE_INVALID)
@@ skipping 27 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (!user)
     return user_manager::UserManager::Get()->GetActiveUser();
   return user;
 }
 
 }  // namespace settings
 }  // namespace chromeos