Revert of Fix MediaRouterContextualMenuUnitTest

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 "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/toolbar/media_router_action.h"
@@ skipping 17 matching lines @@
   }
 
   void TearDown() override {
     action_.reset();
     browser_action_test_util_.reset();
     BrowserWithTestWindowTest::TearDown();
   }
 
   SigninManagerBase* signin_manager() { return signin_manager_; }
   ui::SimpleMenuModel* model() { return model_; }
-  MediaRouterAction* action() { return action_.get(); }
 
  private:
   std::unique_ptr<BrowserActionTestUtil> browser_action_test_util_;
   std::unique_ptr<MediaRouterAction> action_;
   SigninManagerBase* signin_manager_;
   ui::SimpleMenuModel* model_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterContextualMenuUnitTest);
 };
 
@@ skipping 41 matching lines @@
     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(), action());
+  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