Migrate the pref to always show the Cast icon

chrome/browser/prefs/browser_prefs.cc

 // Copyright 2012 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/prefs/browser_prefs.h"
 
 #include <string>
 
 #include "base/files/file_util.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 243 matching lines @@
 #endif
 
 #if defined(USE_ASH)
 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
 #include "chrome/browser/ui/webui/md_history_ui.h"
 #endif
 
+#if BUILDFLAG(ENABLE_EXTENSIONS) && defined(ENABLE_MEDIA_ROUTER)
+#include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
+#endif

[Bernhard Bauer, 2017/03/08 14:05:24]

Can you move this before the OS_CHROMEOS #ifdefs? I try to keep the conditional
includes sorted, but people just add them in random places :-(

[takumif, 2017/03/08 19:09:43]

Putting this with other ENABLE_EXTENSIONS includes. Sorry, not too sure how you
want the other conditionals sorted.

+
 namespace {
 
 #if BUILDFLAG(ENABLE_GOOGLE_NOW)
 // Deprecated 3/2016
 constexpr char kGoogleGeolocationAccessEnabled[] =
     "googlegeolocationaccess.enabled";
 #endif
 
 // Deprecated 4/2016.
 constexpr char kCheckDefaultBrowser[] = "browser.check_default_browser";
@@ skipping 470 matching lines @@
   // Added 8/2016.
   profile_prefs->ClearPref(kStaticEncodings);
   profile_prefs->ClearPref(kRecentlySelectedEncoding);
 
   // Added 9/2016.
   profile_prefs->ClearPref(kWebKitUsesUniversalDetector);
   profile_prefs->ClearPref(kWebKitAllowDisplayingInsecureContent);
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   // Added 2/2017.
-  profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus);
-#endif
+  // NOTE(takumif): When removing this code, also remove the following tests:
+  //  - MediaRouterUIBrowserTest.MigrateToolbarIconShownPref
+  //  - MediaRouterUIBrowserTest.MigrateToolbarIconUnshownPref
+  {
+#if defined(ENABLE_MEDIA_ROUTER)
+    bool show_cast_icon = false;
+    const base::DictionaryValue* action_migration_dict =
+        profile_prefs->GetDictionary(kToolbarMigratedComponentActionStatus);
+    if (action_migration_dict &&
+        action_migration_dict->GetBoolean(
+            ComponentToolbarActionsFactory::kMediaRouterActionId,
+            &show_cast_icon)) {
+      profile_prefs->SetBoolean(prefs::kShowCastIconInToolbar, show_cast_icon);
+    }
+#endif  // defined(ENABLE_MEDIA_ROUTER)
+    profile_prefs->ClearPref(kToolbarMigratedComponentActionStatus);
+  }
+#endif  // BUILDFLAG(ENABLE_EXTENSIONS)
 
   // Added 2/2017.
   {
 #if BUILDFLAG(ENABLE_RLZ)
     const base::DictionaryValue* distro_dict =
         profile_prefs->GetDictionary(kDistroDict);
     int rlz_ping_delay = 0;
     if (distro_dict &&
         distro_dict->GetInteger(kDistroRlzPingDelay, &rlz_ping_delay)) {
       profile_prefs->SetInteger(prefs::kRlzPingDelaySeconds, rlz_ping_delay);
     }
 #endif  // BUILDFLAG(ENABLE_RLZ)
     profile_prefs->ClearPref(kDistroDict);
   }
 }
 
 }  // namespace chrome