Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1550)

Unified Diff: chrome/browser/ui/toolbar/media_router_action_unittest.cc

Issue 1495653003: [Media Router] Check MediaRouterDialogControllerImpl only sets toolbar MediaRouterAction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changes per pkasting@'s comments. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/toolbar/media_router_action_unittest.cc
diff --git a/chrome/browser/ui/toolbar/media_router_action_unittest.cc b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
index 579e98370d5c1b839189302c94e0955bc5d32e96..cceed97a71eea0590f79f5f6fc0ac0eff8c6c20d 100644
--- a/chrome/browser/ui/toolbar/media_router_action_unittest.cc
+++ b/chrome/browser/ui/toolbar/media_router_action_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/extensions/browser_action_test_util.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/toolbar/media_router_action.h"
@@ -34,8 +35,9 @@ class MockToolbarActionViewDelegate : public ToolbarActionViewDelegate {
class TestMediaRouterAction : public MediaRouterAction {
public:
- explicit TestMediaRouterAction(Browser* browser)
- : MediaRouterAction(browser),
+ TestMediaRouterAction(Browser* browser,
+ ToolbarActionsBar* toolbar_actions_bar)
+ : MediaRouterAction(browser, toolbar_actions_bar),
controller_(nullptr),
platform_delegate_(nullptr) {}
~TestMediaRouterAction() override {}
@@ -107,7 +109,12 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
// MediaRouterTest:
void SetUp() override {
MediaRouterTest::SetUp();
- action_.reset(new TestMediaRouterAction(browser()));
+ browser_action_test_util_.reset(
+ new BrowserActionTestUtil(browser(), false));
+ action_.reset(
+ new TestMediaRouterAction(
+ browser(),
+ browser_action_test_util_->GetToolbarActionsBar()));
}
void TearDown() override {
@@ -131,6 +138,10 @@ class MediaRouterActionUnitTest : public MediaRouterTest {
const gfx::Image warning_icon() { return warning_icon_; }
private:
+ // A BrowserActionTestUtil object constructed with the associated
+ // ToolbarActionsBar.
+ scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
+
scoped_ptr<TestMediaRouterAction> action_;
// Fake Issues.

Powered by Google App Engine
This is Rietveld 408576698