Remove base::StringValue

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

 // Copyright 2017 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/fingerprint_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
@@ skipping 10 matching lines @@
 // The max number of fingerprints that can be stored.
 const int kMaxAllowedFingerprints = 5;
 
 std::unique_ptr<base::DictionaryValue> GetFingerprintsInfo(
     const std::vector<base::string16>& fingerprints_list) {
   auto response = base::MakeUnique<base::DictionaryValue>();
   auto fingerprints = base::MakeUnique<base::ListValue>();
 
   DCHECK(int{fingerprints_list.size()} <= kMaxAllowedFingerprints);
   for (auto& fingerprint_name: fingerprints_list) {
-    std::unique_ptr<base::StringValue> str =
-        base::MakeUnique<base::StringValue>(fingerprint_name);
+    std::unique_ptr<base::Value> str =
+        base::MakeUnique<base::Value>(fingerprint_name);
     fingerprints->Append(std::move(str));
   }
 
   response->Set("fingerprintsList", std::move(fingerprints));
   response->SetBoolean(
       "isMaxed", int{fingerprints_list.size()} >= kMaxAllowedFingerprints);
   return response;
 }
 
 }  // namespace
@@ skipping 52 matching lines @@
 void FingerprintHandler::HandleGetFingerprintsList(
     const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(1U, args->GetSize());
   std::string callback_id;
   CHECK(args->GetString(0, &callback_id));
 
   std::unique_ptr<base::DictionaryValue> fingerprint_info =
       GetFingerprintsInfo(fingerprints_list_);
-  ResolveJavascriptCallback(base::StringValue(callback_id), *fingerprint_info);
+  ResolveJavascriptCallback(base::Value(callback_id), *fingerprint_info);
 }
 
 void FingerprintHandler::HandleGetNumFingerprints(const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(1U, args->GetSize());
   std::string callback_id;
   CHECK(args->GetString(0, &callback_id));
 
-  ResolveJavascriptCallback(base::StringValue(callback_id),
+  ResolveJavascriptCallback(base::Value(callback_id),
                             base::Value(int{fingerprints_list_.size()}));
 }
 
 void FingerprintHandler::HandleStartEnroll(const base::ListValue* args) {
 }
 
 void FingerprintHandler::HandleCancelCurrentEnroll(
     const base::ListValue* args) {
 }
 
 void FingerprintHandler::HandleGetEnrollmentLabel(const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(2U, args->GetSize());
   std::string callback_id;
   int index;
   CHECK(args->GetString(0, &callback_id));
   CHECK(args->GetInteger(1, &index));
 
   DCHECK(index < int{fingerprints_list_.size()});
-  ResolveJavascriptCallback(base::StringValue(callback_id),
-                            base::StringValue(fingerprints_list_[index]));
+  ResolveJavascriptCallback(base::Value(callback_id),
+                            base::Value(fingerprints_list_[index]));
 }
 
 void FingerprintHandler::HandleRemoveEnrollment(const base::ListValue* args) {
   AllowJavascript();
 
   CHECK_EQ(2U, args->GetSize());
   std::string callback_id;
   int index;
   CHECK(args->GetString(0, &callback_id));
   CHECK(args->GetInteger(1, &index));
 
   DCHECK(index < int{fingerprints_list_.size()});
   bool deleteSucessful = true;
   fingerprints_list_.erase(fingerprints_list_.begin() + index);
-  ResolveJavascriptCallback(base::StringValue(callback_id),
+  ResolveJavascriptCallback(base::Value(callback_id),
                             base::Value(deleteSucessful));
 }
 
 void FingerprintHandler::HandleChangeEnrollmentLabel(
     const base::ListValue* args) {
   CHECK_EQ(2U, args->GetSize());
   int index;
   std::string new_label;
   CHECK(args->GetInteger(0, &index));
   CHECK(args->GetString(1, &new_label));
@@ skipping 21 matching lines @@
     if (std::find(fingerprints_list_.begin(), fingerprints_list_.end(),
                   fingerprint_name) == fingerprints_list_.end()) {
       fingerprints_list_.push_back(fingerprint_name);
       break;
     }
   }
 }
 
 }  // namespace settings
 }  // namespace chromeos