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

chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc

Index: chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc b/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc
index 118c8cb7fbdfdd70bb478daca88e589f76b3a5f1..520c6f218db8c40c48a82ba93ad4b1537d4993a2 100644
--- a/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_contextual_menu_unittest.cc
@@ -68,11 +68,8 @@ TEST_F(MediaRouterContextualMenuUnitTest, Basic) {
   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);
@@ -81,12 +78,10 @@ TEST_F(MediaRouterContextualMenuUnitTest, Basic) {
     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));
   }
@@ -103,7 +98,6 @@ TEST_F(MediaRouterContextualMenuUnitTest, Basic) {
   }
 }
 
-#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) {
@@ -127,7 +121,6 @@ TEST_F(MediaRouterContextualMenuUnitTest, ToggleCloudServicesItem) {
   EXPECT_FALSE(menu.IsCommandIdChecked(
       IDC_MEDIA_ROUTER_CLOUD_SERVICES_TOGGLE));
 }
-#endif  // GOOGLE_CHROME_BUILD
 
 TEST_F(MediaRouterContextualMenuUnitTest, ToggleAlwaysShowIconItem) {
   MediaRouterContextualMenu menu(browser());