Rename kPinnedAppsPrefAppIDPath to kPinnedAppsPrefAppIDKey

To be consistent with usage of base::Value::SetKey (as opposed to
base::Value::SetPath).

Bug: none
Change-Id: I07648205e14cb17a22409d11cd5d3737f53e01e8
Reviewed-on: https://chromium-review.googlesource.com/c/1449577Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Pavol Marko <pmarko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#629918}

chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc

@@ -351,7 +351,7 @@ void PinnedLauncherAppsPolicyHandler::ApplyList(
   std::vector<base::Value> pinned_apps_list;
   for (const base::Value& entry : filtered_list->GetList()) {
     base::Value app_dict(base::Value::Type::DICTIONARY);
-    app_dict.SetKey(kPinnedAppsPrefAppIDPath, entry.Clone());
+    app_dict.SetKey(kPinnedAppsPrefAppIDKey, entry.Clone());
     pinned_apps_list.push_back(std::move(app_dict));
   }
   prefs->SetValue(prefs::kPolicyPinnedLauncherApps,

chrome/browser/chromeos/policy/configuration_policy_handler_chromeos_unittest.cc

@@ -310,14 +310,14 @@ TEST(PinnedLauncherAppsPolicyHandler, PrefTranslation) {
   // Extension IDs are OK.
   base::Value entry1("abcdefghijklmnopabcdefghijklmnop");
   auto entry1_dict = std::make_unique<base::DictionaryValue>();
-  entry1_dict->Set(kPinnedAppsPrefAppIDPath, entry1.CreateDeepCopy());
+  entry1_dict->Set(kPinnedAppsPrefAppIDKey, entry1.CreateDeepCopy());
   expected_pinned_apps.Append(std::move(entry1_dict));
   list.Append(entry1.CreateDeepCopy());
 
   // Android appds are OK.
   base::Value entry2("com.google.android.gm");
   auto entry2_dict = std::make_unique<base::DictionaryValue>();
-  entry2_dict->Set(kPinnedAppsPrefAppIDPath, entry2.CreateDeepCopy());
+  entry2_dict->Set(kPinnedAppsPrefAppIDKey, entry2.CreateDeepCopy());
   expected_pinned_apps.Append(std::move(entry2_dict));
   list.Append(entry2.CreateDeepCopy());
 

chrome/browser/ui/ash/chrome_launcher_prefs.cc

@@ -76,7 +76,7 @@ struct ComparePinInfo {
 
 }  // namespace
 
-const char kPinnedAppsPrefAppIDPath[] = "id";
+const char kPinnedAppsPrefAppIDKey[] = "id";
 
 void RegisterChromeLauncherUserPrefs(PrefRegistrySimple* registry) {
   registry->RegisterListPref(prefs::kPolicyPinnedLauncherApps);
@@ -107,14 +107,17 @@ std::vector<std::string> GetAppsPinnedByPolicy(
       arc_app_list_pref ? arc_app_list_pref->GetAppIds()
                         : std::vector<std::string>());
 
-  std::string app_id;
-  for (size_t i = 0; i < policy_apps->GetSize(); ++i) {
-    const base::DictionaryValue* dictionary = nullptr;
-    if (!policy_apps->GetDictionary(i, &dictionary) ||
-        !dictionary->GetString(kPinnedAppsPrefAppIDPath, &app_id)) {
+  for (const auto& policy_apps_entry : policy_apps->GetList()) {
+    const base::Value* app_id_value =
+        policy_apps_entry.is_dict()
+            ? policy_apps_entry.FindKeyOfType(kPinnedAppsPrefAppIDKey,
+                                              base::Value::Type::STRING)
+            : nullptr;
+    if (!app_id_value) {
       LOG(ERROR) << "Cannot extract policy app info from prefs.";
       continue;
     }
+    const std::string app_id = app_id_value->GetString();
 
     if (chromeos::DemoSession::Get() &&
         chromeos::DemoSession::Get()->ShouldIgnorePinPolicy(app_id)) {

chrome/browser/ui/ash/chrome_launcher_prefs.h

@@ -14,9 +14,9 @@ class PrefRegistrySimple;
 class PrefService;
 class Profile;
 
-// Path within the dictionary entries in the prefs::kPinnedLauncherApps list
+// Key for the dictionary entries in the prefs::kPinnedLauncherApps list
 // specifying the extension ID of the app to be pinned by that entry.
-extern const char kPinnedAppsPrefAppIDPath[];
+extern const char kPinnedAppsPrefAppIDKey[];
 
 extern const char kPinnedAppsPrefPinnedByPolicy[];
 

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc

@@ -718,12 +718,11 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
         base::WrapUnique<LauncherControllerHelper>(helper));
   }
 
-  void InsertPrefValue(base::ListValue* pref_value,
-                       int index,
+  void AppendPrefValue(base::ListValue* pref_value,
                        const std::string& extension_id) {
-    auto entry = std::make_unique<base::DictionaryValue>();
-    entry->SetString(kPinnedAppsPrefAppIDPath, extension_id);
-    pref_value->Insert(index, std::move(entry));
+    base::DictionaryValue entry;
+    entry.SetKey(kPinnedAppsPrefAppIDKey, base::Value(extension_id));
+    pref_value->GetList().push_back(std::move(entry));
   }
 
   void InsertRemoveAllPinsChange(syncer::SyncChangeList* list) {
@@ -1514,8 +1513,8 @@ TEST_F(ChromeLauncherControllerTest, MergePolicyAndUserPrefPinnedApps) {
 
   base::ListValue policy_value;
   // extension 2 4 are pinned by policy
-  InsertPrefValue(&policy_value, 0, extension2_->id());
-  InsertPrefValue(&policy_value, 1, extensionDocApp_->id());
+  AppendPrefValue(&policy_value, extension2_->id());
+  AppendPrefValue(&policy_value, extensionDocApp_->id());
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kPolicyPinnedLauncherApps, policy_value.CreateDeepCopy());
 
@@ -2980,8 +2979,8 @@ TEST_F(ChromeLauncherControllerTest, Policy) {
 
   // Pin policy should be initilized before controller start.
   base::ListValue policy_value;
-  InsertPrefValue(&policy_value, 0, extension1_->id());
-  InsertPrefValue(&policy_value, 1, extension2_->id());
+  AppendPrefValue(&policy_value, extension1_->id());
+  AppendPrefValue(&policy_value, extension2_->id());
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kPolicyPinnedLauncherApps, policy_value.CreateDeepCopy());
 
@@ -3906,7 +3905,7 @@ TEST_F(ChromeLauncherControllerWithArcTest, ArcAppPinPolicy) {
   // package_name (not hash) specified as id. In this test we check that
   // by hash we can determine that appropriate package was set by policy.
   base::ListValue policy_value;
-  InsertPrefValue(&policy_value, 0, appinfo.package_name);
+  AppendPrefValue(&policy_value, appinfo.package_name);
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kPolicyPinnedLauncherApps, policy_value.CreateDeepCopy());
 
@@ -4568,8 +4567,8 @@ TEST_F(ChromeLauncherControllerDemoModeTest, PinnedAppsOnline) {
 
   extension_service_->AddExtension(extension1_.get());
   extension_service_->AddExtension(extension2_.get());
-  InsertPrefValue(&policy_value, 0, extension1_->id());
-  InsertPrefValue(&policy_value, 1, extension2_->id());
+  AppendPrefValue(&policy_value, extension1_->id());
+  AppendPrefValue(&policy_value, extension2_->id());
 
   arc::mojom::AppInfo appinfo =
       CreateAppInfo("Some App", "SomeActivity", "com.example.app");
@@ -4580,8 +4579,8 @@ TEST_F(ChromeLauncherControllerDemoModeTest, PinnedAppsOnline) {
   const std::string online_only_app_id =
       AddArcAppAndShortcut(online_only_appinfo);
 
-  InsertPrefValue(&policy_value, 2, appinfo.package_name);
-  InsertPrefValue(&policy_value, 3, online_only_appinfo.package_name);
+  AppendPrefValue(&policy_value, appinfo.package_name);
+  AppendPrefValue(&policy_value, online_only_appinfo.package_name);
 
   // If the device is offline, extension2 and onlineonly should be unpinned.
   chromeos::DemoSession::Get()->OverrideIgnorePinPolicyAppsForTesting(
@@ -4618,8 +4617,8 @@ TEST_F(ChromeLauncherControllerDemoModeTest, PinnedAppsOffline) {
 
   extension_service_->AddExtension(extension1_.get());
   extension_service_->AddExtension(extension2_.get());
-  InsertPrefValue(&policy_value, 0, extension1_->id());
-  InsertPrefValue(&policy_value, 1, extension2_->id());
+  AppendPrefValue(&policy_value, extension1_->id());
+  AppendPrefValue(&policy_value, extension2_->id());
 
   arc::mojom::AppInfo appinfo =
       CreateAppInfo("Some App", "SomeActivity", "com.example.app");
@@ -4630,8 +4629,8 @@ TEST_F(ChromeLauncherControllerDemoModeTest, PinnedAppsOffline) {
   const std::string online_only_app_id =
       AddArcAppAndShortcut(online_only_appinfo);
 
-  InsertPrefValue(&policy_value, 2, appinfo.package_name);
-  InsertPrefValue(&policy_value, 3, online_only_appinfo.package_name);
+  AppendPrefValue(&policy_value, appinfo.package_name);
+  AppendPrefValue(&policy_value, online_only_appinfo.package_name);
 
   // If the device is offline, extension2 and onlineonly should be unpinned.
   chromeos::DemoSession::Get()->OverrideIgnorePinPolicyAppsForTesting(

chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.cc

@@ -49,7 +49,7 @@ AppListControllerDelegate::Pinnable GetPinnableForAppID(
     const base::DictionaryValue* app = nullptr;
     std::string app_id_or_package;
     if (pref->GetDictionary(index, &app) &&
-        app->GetString(kPinnedAppsPrefAppIDPath, &app_id_or_package) &&
+        app->GetString(kPinnedAppsPrefAppIDKey, &app_id_or_package) &&
         (app_id == app_id_or_package ||
          arc_app_package_name == app_id_or_package)) {
       if (chromeos::DemoSession::Get() &&