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

chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc

 // Copyright 2016 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 <memory>
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action_test_util.h"
@@ skipping 50 matching lines @@
 // Tests the basic state of the contextual menu.
 TEST_F(MediaRouterContextualMenuUnitTest, Basic) {
   int expected_number_items = 7;
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
   // On all platforms except Linux, there's an additional menu item to access
   // Cast device management.
   expected_number_items++;
 #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_CHROMEOS)
 
-#if defined(GOOGLE_CHROME_BUILD)
-  // In official Chrome builds, there's an additional menu item to toggle cloud
-  // services settings.
+  // An additional menu item to toggle cloud services settings.

[msw, 2016/10/27 18:14:31]

nit: just init |expected_number_items| to 8 instead of 7... though a comment
listing all the items might be nice.

[mark a. foltz, 2016/10/27 20:16:49]

Done.

   expected_number_items++;
-#endif  // GOOGLE_CHROME_BUILD
 
   // Verify the number of menu items, including separators.
   EXPECT_EQ(model()->GetItemCount(), expected_number_items);
 
   for (int i = 0; i < expected_number_items; i++) {
     EXPECT_TRUE(model()->IsEnabledAt(i));
     bool expected_visibility = true;

[msw, 2016/10/27 18:14:31]

nit: combine |expected_visibility| decl and init. (or inline in EXPECT_EQ)

[mark a. foltz, 2016/10/27 20:16:49]

Done.

 
-#if defined(GOOGLE_CHROME_BUILD)
-    // In official Chrome builds, the cloud services toggle exists and is
-    // enabled, but not visible until the user has authenticated their account.
+    // The cloud services toggle exists and is enabled, but not visible until
+    // the user has authenticated their account.
     expected_visibility =
         model()->GetCommandIdAt(i) != IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE;
-#endif  // GOOGLE_CHROME_BUILD
 
     EXPECT_EQ(expected_visibility, model()->IsVisibleAt(i));
   }
 
   // Set up an authenticated account.
   signin_manager()->SetAuthenticatedAccountInfo("foo@bar.com", "password");
 
   // Run the same checks as before. All existing menu items should be now
   // enabled and visible.
   EXPECT_EQ(model()->GetItemCount(), expected_number_items);
   for (int i = 0; i < expected_number_items; i++) {
     EXPECT_TRUE(model()->IsEnabledAt(i));
     EXPECT_TRUE(model()->IsVisibleAt(i));
   }
 }
 
-#if defined(GOOGLE_CHROME_BUILD)
 // Tests whether the cloud services item is correctly toggled. This menu item
 // is only availble on official Chrome builds.
 TEST_F(MediaRouterContextualMenuUnitTest, ToggleCloudServicesItem) {
   // The Media Router Action has a getter for the model, but not the delegate.
   // Create the MediaRouterContextualMenu ui::SimpleMenuModel::Delegate here.
   MediaRouterContextualMenu menu(browser());
 
   // Set up an authenticated account such that the cloud services menu item is
   // surfaced. Whether or not it is surfaced is tested in the "Basic" test.
   signin_manager()->SetAuthenticatedAccountInfo("foo@bar.com", "password");
 
   // By default, the command is not checked.
   EXPECT_FALSE(menu.IsCommandIdChecked(
       IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE));
 
   menu.ExecuteCommand(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, 0);
   EXPECT_TRUE(menu.IsCommandIdChecked(
       IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE));
 
   menu.ExecuteCommand(IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE, 0);
   EXPECT_FALSE(menu.IsCommandIdChecked(
       IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE));
 }
-#endif  // GOOGLE_CHROME_BUILD
 
 TEST_F(MediaRouterContextualMenuUnitTest, ToggleAlwaysShowIconItem) {
   MediaRouterContextualMenu menu(browser());
   extensions::ComponentMigrationHelper* const component_migration_helper =
       toolbar_actions_model()->component_migration_helper();
 
   // Whether the option is checked should reflect the pref.
   component_migration_helper->SetComponentActionPref(
       ComponentToolbarActionsFactory::kMediaRouterActionId, true);
   EXPECT_TRUE(
       menu.IsCommandIdChecked(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION));
 
   component_migration_helper->SetComponentActionPref(
       ComponentToolbarActionsFactory::kMediaRouterActionId, false);
   EXPECT_FALSE(
       menu.IsCommandIdChecked(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION));
 
   // Executing the option should toggle the pref.
   menu.ExecuteCommand(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, 0);
   EXPECT_TRUE(component_migration_helper->GetComponentActionPref(
       ComponentToolbarActionsFactory::kMediaRouterActionId));
 
   menu.ExecuteCommand(IDC_MEDIA_ROUTER_ALWAYS_SHOW_TOOLBAR_ACTION, 0);
   EXPECT_FALSE(component_migration_helper->GetComponentActionPref(
       ComponentToolbarActionsFactory::kMediaRouterActionId));
 }