[CodeHealth] Migrate /chrome/browser/ui off deprecated base::Value::T…

…ype::DICTIONARY

Bug: 1291670
Change-Id: I87646bd43afbd806538666730ed3c534d82ff931
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4108436
Reviewed-by: Dana Fried <dfried@chromium.org>
Reviewed-by: Tien Mai <tienmai@chromium.org>
Commit-Queue: Yao Xiao <yaoxia@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1085078}

chrome/browser/ui/ash/thumbnail_loader.cc

@@ -403,8 +403,7 @@ void ThumbnailLoader::LoadForFileWithMetadata(
 
   // Generate an image loader request. The request type is defined in
   // ui/file_manager/image_loader/load_image_request.js.
-  base::Value request_value(base::Value::Type::DICTIONARY);
-  base::Value::Dict& request_dict = request_value.GetDict();
+  base::Value::Dict request_dict;
   request_dict.Set("taskId", base::Value(request_id.ToString()));
   request_dict.Set("url", base::Value(thumbnail_url.spec()));
   request_dict.Set("timestamp", base::TimeToValue(file_info.last_modified));
@@ -416,7 +415,7 @@ void ThumbnailLoader::LoadForFileWithMetadata(
   request_dict.Set("height", base::Value(size));
 
   std::string request_message;
-  base::JSONWriter::Write(request_value, &request_message);
+  base::JSONWriter::Write(request_dict, &request_message);
 
   // Open a channel to the image loader extension using a message host that send
   // the image loader request.

chrome/browser/ui/cocoa/applescript/apple_event_util.mm

@@ -94,7 +94,7 @@ void AppendValueToListDescriptor(NSAppleEventDescriptor* list,
       NOTREACHED();
       break;
 
-    case base::Value::Type::DICTIONARY: {
+    case base::Value::Type::DICT: {
       NSAppleEventDescriptor* keyValuePairs =
           [NSAppleEventDescriptor listDescriptor];
       for (auto iter : value->DictItems()) {

chrome/browser/ui/extensions/extension_installed_bubble_model_unittest.cc

@@ -55,15 +55,14 @@ class ExtensionInstalledBubbleModelTest : public BrowserWithTestWindowTest {
 
   void AddBrowserActionKeyBinding(extensions::ExtensionBuilder* builder,
                                   const std::string& key) {
-    base::Value command(base::Value::Type::DICTIONARY);
-    command.SetStringKey("suggested_key", key);
-    command.SetStringKey("description", "Invoke the page action");
-    auto commands =
-        std::make_unique<base::Value>(base::Value::Type::DICTIONARY);
-    commands->SetKey(extensions::manifest_values::kBrowserActionCommandEvent,
-                     std::move(command));
+    base::Value::Dict command;
+    command.Set("suggested_key", key);
+    command.Set("description", "Invoke the page action");
+    base::Value::Dict commands;
+    commands.Set(extensions::manifest_values::kBrowserActionCommandEvent,
+                 base::Value(std::move(command)));
     builder->SetManifestKey(extensions::manifest_keys::kCommands,
-                            std::move(commands));
+                            std::make_unique<base::Value>(std::move(commands)));
   }
 
   extensions::ExtensionService* extension_service() {

chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.cc

@@ -29,44 +29,41 @@ const char
     CredentialProviderSigninDialogTestDataStorage::kInvalidEmailForSignin[] =
         "foo_bar@example.com";
 CredentialProviderSigninDialogTestDataStorage::
-    CredentialProviderSigninDialogTestDataStorage()
-    : expected_success_signin_result_(base::Value::Type::DICTIONARY),
-      expected_success_fetch_result_(base::Value::Type::DICTIONARY) {
+    CredentialProviderSigninDialogTestDataStorage() {
   SetSigninPassword("password");
 }
 
 void CredentialProviderSigninDialogTestDataStorage::SetSigninPassword(
     const std::string& password) {
   // Initialize expected successful result from oauth2 fetches.
-  expected_success_fetch_result_.SetKey(credential_provider::kKeyTokenHandle,
-                                        base::Value("token_handle"));
-  expected_success_fetch_result_.SetKey(credential_provider::kKeyMdmIdToken,
-                                        base::Value("mdm_token"));
-  expected_success_fetch_result_.SetKey(credential_provider::kKeyFullname,
-                                        base::Value("Foo Bar"));
-  expected_success_fetch_result_.SetKey(credential_provider::kKeyMdmAccessToken,
-                                        base::Value("123456789"));
+  expected_success_fetch_result_.Set(credential_provider::kKeyTokenHandle,
+                                     base::Value("token_handle"));
+  expected_success_fetch_result_.Set(credential_provider::kKeyMdmIdToken,
+                                     base::Value("mdm_token"));
+  expected_success_fetch_result_.Set(credential_provider::kKeyFullname,
+                                     base::Value("Foo Bar"));
+  expected_success_fetch_result_.Set(credential_provider::kKeyMdmAccessToken,
+                                     base::Value("123456789"));
 
   // Initialize expected successful full result sent to the credential provider.
-  expected_success_signin_result_.SetKey(credential_provider::kKeyId,
-                                         base::Value("gaia_user_id"));
-  expected_success_signin_result_.SetKey(credential_provider::kKeyPassword,
-                                         base::Value(password));
-  expected_success_signin_result_.SetKey(credential_provider::kKeyEmail,
-                                         base::Value("foo_bar@gmail.com"));
-  expected_success_signin_result_.SetKey(credential_provider::kKeyAccessToken,
-                                         base::Value("access_token"));
-  expected_success_signin_result_.SetKey(credential_provider::kKeyRefreshToken,
-                                         base::Value("refresh_token"));
-  expected_success_signin_result_.SetKey(
+  expected_success_signin_result_.Set(credential_provider::kKeyId,
+                                      base::Value("gaia_user_id"));
+  expected_success_signin_result_.Set(credential_provider::kKeyPassword,
+                                      base::Value(password));
+  expected_success_signin_result_.Set(credential_provider::kKeyEmail,
+                                      base::Value("foo_bar@gmail.com"));
+  expected_success_signin_result_.Set(credential_provider::kKeyAccessToken,
+                                      base::Value("access_token"));
+  expected_success_signin_result_.Set(credential_provider::kKeyRefreshToken,
+                                      base::Value("refresh_token"));
+  expected_success_signin_result_.Set(
       credential_provider::kKeyExitCode,
       base::Value(credential_provider::kUiecSuccess));
 
   // Merge with results from chrome://inline-signin to form the full
   // result.
   expected_success_full_result_ = expected_success_signin_result_.Clone();
-  expected_success_full_result_.MergeDictionary(
-      &expected_success_fetch_result_);
+  expected_success_full_result_.Merge(expected_success_fetch_result_.Clone());
 }
 
 // static
@@ -77,23 +74,21 @@ CredentialProviderSigninDialogTestDataStorage::MakeSignInResponseValue(
     const std::string& email,
     const std::string& access_token,
     const std::string& refresh_token) {
-  base::Value args(base::Value::Type::DICTIONARY);
+  base::Value::Dict args;
   if (!email.empty())
-    args.SetKey(credential_provider::kKeyEmail, base::Value(email));
+    args.Set(credential_provider::kKeyEmail, base::Value(email));
   if (!password.empty())
-    args.SetKey(credential_provider::kKeyPassword, base::Value(password));
+    args.Set(credential_provider::kKeyPassword, base::Value(password));
   if (!id.empty())
-    args.SetKey(credential_provider::kKeyId, base::Value(id));
+    args.Set(credential_provider::kKeyId, base::Value(id));
   if (!refresh_token.empty())
-    args.SetKey(credential_provider::kKeyRefreshToken,
-                base::Value(refresh_token));
+    args.Set(credential_provider::kKeyRefreshToken, base::Value(refresh_token));
   if (!access_token.empty())
-    args.SetKey(credential_provider::kKeyAccessToken,
-                base::Value(access_token));
+    args.Set(credential_provider::kKeyAccessToken, base::Value(access_token));
 
-  args.SetKey(credential_provider::kKeyExitCode,
-              base::Value(credential_provider::kUiecSuccess));
-  return args;
+  args.Set(credential_provider::kKeyExitCode,
+           base::Value(credential_provider::kUiecSuccess));
+  return base::Value(std::move(args));
 }
 
 base::Value

chrome/browser/ui/startup/credential_provider_signin_dialog_win_test_data.h

@@ -32,51 +32,50 @@ class CredentialProviderSigninDialogTestDataStorage {
   void SetSigninPassword(const std::string& password);
 
   std::string GetSuccessId() const {
-    return expected_success_signin_result_.FindKey("id")->GetString();
+    return expected_success_signin_result_.Find("id")->GetString();
   }
   std::string GetSuccessPassword() const {
-    return expected_success_signin_result_.FindKey("password")->GetString();
+    return expected_success_signin_result_.Find("password")->GetString();
   }
   std::string GetSuccessEmail() const {
-    return expected_success_signin_result_.FindKey("email")->GetString();
+    return expected_success_signin_result_.Find("email")->GetString();
   }
   std::string GetSuccessAccessToken() const {
-    return expected_success_signin_result_.FindKey("access_token")->GetString();
+    return expected_success_signin_result_.Find("access_token")->GetString();
   }
   std::string GetSuccessRefreshToken() const {
-    return expected_success_signin_result_.FindKey("refresh_token")
-        ->GetString();
+    return expected_success_signin_result_.Find("refresh_token")->GetString();
   }
   std::string GetSuccessTokenHandle() const {
-    return expected_success_fetch_result_.FindKey("token_handle")->GetString();
+    return expected_success_fetch_result_.Find("token_handle")->GetString();
   }
   std::string GetSuccessMdmIdToken() const {
-    return expected_success_fetch_result_.FindKey("mdm_id_token")->GetString();
+    return expected_success_fetch_result_.Find("mdm_id_token")->GetString();
   }
   std::string GetSuccessMdmAccessToken() const {
-    return expected_success_fetch_result_.FindKey("mdm_access_token")
-        ->GetString();
+    return expected_success_fetch_result_.Find("mdm_access_token")->GetString();
   }
   std::string GetSuccessFullName() const {
-    return expected_success_fetch_result_.FindKey("full_name")->GetString();
+    return expected_success_fetch_result_.Find("full_name")->GetString();
   }
 
-  const base::Value& expected_signin_result() const {
+  const base::Value::Dict& expected_signin_result() const {
     return expected_success_signin_result_;
   }
 
-  const base::Value& expected_success_fetch_result() const {
+  const base::Value::Dict& expected_success_fetch_result() const {
     return expected_success_fetch_result_;
   }
 
-  const base::Value& expected_full_result() const {
+  const base::Value::Dict& expected_full_result() const {
     return expected_success_full_result_;
   }
 
-  bool EqualsSuccessfulSigninResult(const base::Value& result_value) const {
+  bool EqualsSuccessfulSigninResult(
+      const base::Value::Dict& result_value) const {
     return EqualsEncodedValue(expected_signin_result(), result_value);
   }
-  bool EqualsSccessfulFetchResult(const base::Value& result_value) const {
+  bool EqualsSccessfulFetchResult(const base::Value::Dict& result_value) const {
     return EqualsEncodedValue(expected_success_fetch_result(), result_value);
   }
 
@@ -92,21 +91,21 @@ class CredentialProviderSigninDialogTestDataStorage {
   static const char kInvalidEmailForSignin[];
 
  private:
-  bool EqualsEncodedValue(const base::Value& success_value,
-                          const base::Value& result_value) const {
+  bool EqualsEncodedValue(const base::Value::Dict& success_value,
+                          const base::Value::Dict& result_value) const {
     return result_value == success_value;
   }
 
   // An expected successful result from chrome://inline-signin.
-  base::Value expected_success_signin_result_;
+  base::Value::Dict expected_success_signin_result_;
 
   // An expected successful result from oauth2 fetches for user info, token
   // handle, and id token.
-  base::Value expected_success_fetch_result_;
+  base::Value::Dict expected_success_fetch_result_;
 
   // An expected successful full result sent to the credential provider from
   // GLS.
-  base::Value expected_success_full_result_;
+  base::Value::Dict expected_success_full_result_;
 };
 
 #endif  // CHROME_BROWSER_UI_STARTUP_CREDENTIAL_PROVIDER_SIGNIN_DIALOG_WIN_TEST_DATA_H_

chrome/browser/ui/startup/credential_provider_signin_info_fetcher_win_unittest.cc

@@ -151,8 +151,8 @@ TEST_F(CredentialProviderFetcherTest, ValidFetchResult) {
 
   RunFetcher("");
   EXPECT_FALSE(fetch_result_.empty());
-  EXPECT_TRUE(test_data_storage_.EqualsSccessfulFetchResult(
-      base::Value(std::move(fetch_result_))));
+  EXPECT_TRUE(
+      test_data_storage_.EqualsSccessfulFetchResult(std::move(fetch_result_)));
 }
 
 TEST_F(CredentialProviderFetcherTest,

chrome/browser/ui/startup/startup_browser_creator_browsertest.cc

@@ -2112,37 +2112,37 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserWithListAppsFeature,
       &app_name4, &app_name3, &app_name2, &app_name1};
   std::vector<web_app::AppId*> expected_open_apps_id = {&app_id1, &app_id3};
   std::vector<std::string*> expected_open_apps_name = {&app_name1, &app_name3};
-  base::Value apps_for_all_profiles(base::Value::Type::DICTIONARY);
-  base::Value& installed_apps_for_all_profile = *apps_for_all_profiles.SetKey(
+  base::Value::Dict apps_for_all_profiles;
+  base::Value& installed_apps_for_all_profile = *apps_for_all_profiles.Set(
       "installed_web_apps", base::Value(base::Value::Type::LIST));
-  base::Value& open_apps_for_all_profile = *apps_for_all_profiles.SetKey(
+  base::Value& open_apps_for_all_profile = *apps_for_all_profiles.Set(
       "open_web_apps", base::Value(base::Value::Type::LIST));
   for (int i = 0; i < 2; i++) {
     // Get installed web apps.
-    base::Value installed_item_info(base::Value::Type::DICTIONARY);
-    installed_item_info.SetStringKey(
-        "profile_id", expected_profiles[i]->GetBaseName().AsUTF8Unsafe());
-    base::Value& installed_apps_per_profile = *installed_item_info.SetKey(
+    base::Value::Dict installed_item_info;
+    installed_item_info.Set("profile_id",
+                            expected_profiles[i]->GetBaseName().AsUTF8Unsafe());
+    base::Value& installed_apps_per_profile = *installed_item_info.Set(
         "web_apps", base::Value(base::Value::Type::LIST));
     for (int j = 0; j < 2; j++) {
-      base::Value web_app_info(base::Value::Type::DICTIONARY);
-      web_app_info.SetStringKey("id", *expected_installed_apps_id[i * 2 + j]);
-      web_app_info.SetStringKey("name",
-                                *expected_installed_apps_name[i * 2 + j]);
-      installed_apps_per_profile.Append(std::move(web_app_info));
+      base::Value::Dict web_app_info;
+      web_app_info.Set("id", *expected_installed_apps_id[i * 2 + j]);
+      web_app_info.Set("name", *expected_installed_apps_name[i * 2 + j]);
+      installed_apps_per_profile.Append(base::Value(std::move(web_app_info)));
     }
-    installed_apps_for_all_profile.Append(std::move(installed_item_info));
+    installed_apps_for_all_profile.Append(
+        base::Value(std::move(installed_item_info)));
     // Get open web apps.
-    base::Value open_item_info(base::Value::Type::DICTIONARY);
-    open_item_info.SetStringKey(
-        "profile_id", expected_profiles[1 - i]->GetBaseName().AsUTF8Unsafe());
-    base::Value& open_apps_per_profile = *open_item_info.SetKey(
-        "web_apps", base::Value(base::Value::Type::LIST));
-    base::Value web_app_info(base::Value::Type::DICTIONARY);
-    web_app_info.SetStringKey("id", *expected_open_apps_id[i]);
-    web_app_info.SetStringKey("name", *expected_open_apps_name[i]);
-    open_apps_per_profile.Append(std::move(web_app_info));
-    open_apps_for_all_profile.Append(std::move(open_item_info));
+    base::Value::Dict open_item_info;
+    open_item_info.Set("profile_id",
+                       expected_profiles[1 - i]->GetBaseName().AsUTF8Unsafe());
+    base::Value& open_apps_per_profile =
+        *open_item_info.Set("web_apps", base::Value(base::Value::Type::LIST));
+    base::Value::Dict web_app_info;
+    web_app_info.Set("id", *expected_open_apps_id[i]);
+    web_app_info.Set("name", *expected_open_apps_name[i]);
+    open_apps_per_profile.Append(base::Value(std::move(web_app_info)));
+    open_apps_for_all_profile.Append(base::Value(std::move(open_item_info)));
   }
 
   std::string expected_info;
@@ -2213,38 +2213,36 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserWithListAppsFeature,
   ASSERT_NE(app_browser2, nullptr);
 
   // List web apps for the given profile.
-  base::Value apps_for_given_profiles(base::Value::Type::DICTIONARY);
-  base::Value& installed_apps_for_given_profile =
-      *apps_for_given_profiles.SetKey("installed_web_apps",
-                                      base::Value(base::Value::Type::LIST));
-  base::Value& open_apps_for_given_profile = *apps_for_given_profiles.SetKey(
+  base::Value::Dict apps_for_given_profiles;
+  base::Value& installed_apps_for_given_profile = *apps_for_given_profiles.Set(
+      "installed_web_apps", base::Value(base::Value::Type::LIST));
+  base::Value& open_apps_for_given_profile = *apps_for_given_profiles.Set(
       "open_web_apps", base::Value(base::Value::Type::LIST));
   // Get installed web apps.
-  base::Value installed_item_info(base::Value::Type::DICTIONARY);
-  installed_item_info.SetStringKey("profile_id",
-                                   profile2->GetBaseName().AsUTF8Unsafe());
-  base::Value& installed_apps_per_profile = *installed_item_info.SetKey(
+  base::Value::Dict installed_item_info;
+  installed_item_info.Set("profile_id", profile2->GetBaseName().AsUTF8Unsafe());
+  base::Value& installed_apps_per_profile = *installed_item_info.Set(
       "web_apps", base::Value(base::Value::Type::LIST));
-  base::Value web_app_info1(base::Value::Type::DICTIONARY);
-  web_app_info1.SetStringKey("name", app_name4);
-  web_app_info1.SetStringKey("id", app_id4);
-  installed_apps_per_profile.Append(std::move(web_app_info1));
-  base::Value web_app_info2(base::Value::Type::DICTIONARY);
-  web_app_info2.SetStringKey("name", app_name3);
-  web_app_info2.SetStringKey("id", app_id3);
-  installed_apps_per_profile.Append(std::move(web_app_info2));
-  installed_apps_for_given_profile.Append(std::move(installed_item_info));
+  base::Value::Dict web_app_info1;
+  web_app_info1.Set("name", app_name4);
+  web_app_info1.Set("id", app_id4);
+  installed_apps_per_profile.Append(base::Value(std::move(web_app_info1)));
+  base::Value::Dict web_app_info2;
+  web_app_info2.Set("name", app_name3);
+  web_app_info2.Set("id", app_id3);
+  installed_apps_per_profile.Append(base::Value(std::move(web_app_info2)));
+  installed_apps_for_given_profile.Append(
+      base::Value(std::move(installed_item_info)));
   // Get open web apps.
-  base::Value open_item_info(base::Value::Type::DICTIONARY);
-  open_item_info.SetStringKey("profile_id",
-                              profile2->GetBaseName().AsUTF8Unsafe());
+  base::Value::Dict open_item_info;
+  open_item_info.Set("profile_id", profile2->GetBaseName().AsUTF8Unsafe());
   base::Value& open_apps_per_profile =
-      *open_item_info.SetKey("web_apps", base::Value(base::Value::Type::LIST));
-  base::Value web_app_info3(base::Value::Type::DICTIONARY);
-  web_app_info3.SetStringKey("name", app_name3);
-  web_app_info3.SetStringKey("id", app_id3);
-  open_apps_per_profile.Append(std::move(web_app_info3));
-  open_apps_for_given_profile.Append(std::move(open_item_info));
+      *open_item_info.Set("web_apps", base::Value(base::Value::Type::LIST));
+  base::Value::Dict web_app_info3;
+  web_app_info3.Set("name", app_name3);
+  web_app_info3.Set("id", app_id3);
+  open_apps_per_profile.Append(base::Value(std::move(web_app_info3)));
+  open_apps_for_given_profile.Append(base::Value(std::move(open_item_info)));
 
   std::string expected_info;
   JSONStringValueSerializer serializer(&expected_info);