[Media Router] Update Media Router flags post-launch.

chrome/browser/ui/toolbar/media_router_contextual_menu.cc

Index: chrome/browser/ui/toolbar/media_router_contextual_menu.cc
diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
index 7e2c3045104fac867237b715847f5aa980f837ee..a7d5bc4e4561162925ce00183d61af0ea2578ae5 100644
--- a/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
+++ b/chrome/browser/ui/toolbar/media_router_contextual_menu.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/media/router/media_router_factory.h"
 #include "chrome/browser/media/router/mojo/media_router_mojo_impl.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
@@ -20,13 +21,10 @@
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "components/signin/core/browser/signin_manager.h"
 #include "extensions/common/constants.h"
 #include "ui/base/models/menu_model_delegate.h"
 
-#if defined(GOOGLE_CHROME_BUILD)
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "components/signin/core/browser/signin_manager.h"
-#endif  // defined(GOOGLE_CHROME_BUILD)
 
 MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser)
     : browser_(browser),
@@ -50,10 +48,8 @@ MediaRouterContextualMenu::MediaRouterContextualMenu(Browser* browser)
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_MANAGE_DEVICES,
                                   IDS_MEDIA_ROUTER_MANAGE_DEVICES);
 #endif
-#if defined(GOOGLE_CHROME_BUILD)
   menu_model_.AddCheckItemWithStringId(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE,
                                        IDS_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE);
-#endif  // defined(GOOGLE_CHROME_BUILD)
   menu_model_.AddItemWithStringId(IDC_MEDIA_ROUTER_REPORT_ISSUE,
                                   IDS_MEDIA_ROUTER_REPORT_ISSUE);
 }
@@ -71,12 +67,10 @@ void MediaRouterContextualMenu::SetAlwaysShowActionPref(bool always_show) {
 }
 
 bool MediaRouterContextualMenu::IsCommandIdChecked(int command_id) const {
-#if defined(GOOGLE_CHROME_BUILD)
   if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) {
     return browser_->profile()->GetPrefs()->GetBoolean(
         prefs::kMediaRouterEnableCloudServices);
   }
-#endif  // defined(GOOGLE_CHROME_BUILD)
   if (command_id == IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION) {
     return GetAlwaysShowActionPref();
   }
@@ -88,7 +82,6 @@ bool MediaRouterContextualMenu::IsCommandIdEnabled(int command_id) const {
 }
 
 bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const {
-#if defined(GOOGLE_CHROME_BUILD)
   if (command_id == IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE) {
     // Cloud services preference is not set or used if the user is not signed
     // in.
@@ -96,7 +89,6 @@ bool MediaRouterContextualMenu::IsCommandIdVisible(int command_id) const {
         SigninManagerFactory::GetForProfile(browser_->profile());
     return signin_manager && signin_manager->IsAuthenticated();
   }
-#endif  // defined(GOOGLE_CHROME_BUILD)
   return true;
 }
 
@@ -109,9 +101,7 @@ void MediaRouterContextualMenu::ExecuteCommand(int command_id,
   const char kCastLearnMorePageUrl[] =
       "https://support.google.com/chromecast/answer/2998338";
 
-#if defined(GOOGLE_CHROME_BUILD)
   PrefService* pref_service;
-#endif  // defined(GOOGLE_CHROME_BUILD)
   switch (command_id) {
     case IDC_MEDIA_ROUTER_ABOUT:
       chrome::ShowSingletonTab(browser_, GURL(kAboutPageUrl));
@@ -119,7 +109,6 @@ void MediaRouterContextualMenu::ExecuteCommand(int command_id,
     case IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION:
       SetAlwaysShowActionPref(!GetAlwaysShowActionPref());
       break;
-#if defined(GOOGLE_CHROME_BUILD)
     case IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE:
       pref_service = browser_->profile()->GetPrefs();
       pref_service->SetBoolean(prefs::kMediaRouterEnableCloudServices,
@@ -128,7 +117,6 @@ void MediaRouterContextualMenu::ExecuteCommand(int command_id,
       // If this has been set before, this is a no-op.
       pref_service->SetBoolean(prefs::kMediaRouterCloudServicesPrefSet, true);
       break;
-#endif  // defined(GOOGLE_CHROME_BUILD)
     case IDC_MEDIA_ROUTER_HELP:
       chrome::ShowSingletonTab(browser_, GURL(kCastHelpCenterPageUrl));
       base::RecordAction(base::UserMetricsAction(