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

Unified Diff: chrome/browser/ui/views/media_router/media_router_ui_browsertest.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. Fixed OSX segfaults. 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
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
diff --git a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
index 060f8ec87e38ae8b5ce46b19c227f4181820f135..75beee6386384b5b876b3852dc7d5b5bbf3706b0 100644
--- a/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
+++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
@@ -4,6 +4,7 @@
#include "base/bind.h"
#include "base/thread_task_runner_handle.h"
+#include "chrome/browser/extensions/browser_action_test_util.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -37,7 +38,10 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
->browser_actions();
ASSERT_TRUE(browser_actions_container);
- media_router_action_.reset(new MediaRouterAction(browser()));
+ browser_action_test_util_.reset(new BrowserActionTestUtil(browser(),
+ false));
+ media_router_action_.reset(new MediaRouterAction(browser(),
+ browser_action_test_util_->GetToolbarActionsBar()));
// Sets delegate on |media_router_action_|.
toolbar_action_view_.reset(
@@ -48,6 +52,7 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
void TearDownOnMainThread() override {
toolbar_action_view_.reset();
media_router_action_.reset();
+ browser_action_test_util_.reset();
InProcessBrowserTest::TearDownOnMainThread();
}
@@ -82,6 +87,7 @@ class MediaRouterUIBrowserTest : public InProcessBrowserTest {
protected:
// Must be initialized after |InProcessBrowserTest::SetUpOnMainThread|.
+ scoped_ptr<BrowserActionTestUtil> browser_action_test_util_;
scoped_ptr<MediaRouterAction> media_router_action_;
// ToolbarActionView constructed to set the delegate on |mr_action|.
« no previous file with comments | « chrome/browser/ui/toolbar/toolbar_actions_model.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698