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

Side by Side Diff: chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

Issue 2621723003: [Media Router] Add browser tests for showing the dialog (Closed)
Patch Set: Created 3 years, 11 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "base/threading/thread_task_runner_handle.h" 6 #include "base/threading/thread_task_runner_handle.h"
7 #include "chrome/app/chrome_command_ids.h"
7 #include "chrome/browser/extensions/browser_action_test_util.h" 8 #include "chrome/browser/extensions/browser_action_test_util.h"
8 #include "chrome/browser/media/router/media_router_ui_service.h" 9 #include "chrome/browser/media/router/media_router_ui_service.h"
10 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h"
9 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_commands.h" 12 #include "chrome/browser/ui/browser_commands.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h" 14 #include "chrome/browser/ui/toolbar/component_toolbar_actions_factory.h"
13 #include "chrome/browser/ui/toolbar/media_router_action.h" 15 #include "chrome/browser/ui/toolbar/media_router_action.h"
14 #include "chrome/browser/ui/toolbar/media_router_action_controller.h" 16 #include "chrome/browser/ui/toolbar/media_router_action_controller.h"
15 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h" 17 #include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
16 #include "chrome/browser/ui/views/frame/browser_view.h" 18 #include "chrome/browser/ui/views/frame/browser_view.h"
19 #include "chrome/browser/ui/views/toolbar/app_menu.h"
17 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" 20 #include "chrome/browser/ui/views/toolbar/app_menu_button.h"
18 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" 21 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
19 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h" 22 #include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
20 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" 23 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
21 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h" 24 #include "chrome/browser/ui/webui/media_router/media_router_dialog_controller_im pl.h"
22 #include "chrome/common/url_constants.h" 25 #include "chrome/common/url_constants.h"
23 #include "chrome/test/base/in_process_browser_test.h" 26 #include "chrome/test/base/in_process_browser_test.h"
24 #include "chrome/test/base/ui_test_utils.h" 27 #include "chrome/test/base/ui_test_utils.h"
28 #include "content/public/browser/navigation_entry.h"
25 #include "content/public/browser/web_contents.h" 29 #include "content/public/browser/web_contents.h"
30 #include "content/public/common/context_menu_params.h"
26 #include "content/public/test/test_navigation_observer.h" 31 #include "content/public/test/test_navigation_observer.h"
27 #include "content/public/test/test_utils.h" 32 #include "content/public/test/test_utils.h"
28 #include "ui/views/widget/widget.h" 33 #include "ui/views/widget/widget.h"
29 34
30 namespace media_router { 35 namespace media_router {
31 36
32 class MediaRouterUIBrowserTest : public InProcessBrowserTest { 37 class MediaRouterUIBrowserTest : public InProcessBrowserTest {
33 public: 38 public:
34 MediaRouterUIBrowserTest() 39 MediaRouterUIBrowserTest()
35 : issue_(IssueInfo("title notification", 40 : issue_(IssueInfo("title notification",
(...skipping 15 matching lines...) Expand all
51 MediaRouterUIService::Get(browser()->profile())->action_controller(); 56 MediaRouterUIService::Get(browser()->profile())->action_controller();
52 57
53 routes_ = {MediaRoute("routeId1", MediaSource("sourceId"), "sinkId1", 58 routes_ = {MediaRoute("routeId1", MediaSource("sourceId"), "sinkId1",
54 "description", true, std::string(), true)}; 59 "description", true, std::string(), true)};
55 } 60 }
56 61
57 void OpenMediaRouterDialogAndWaitForNewWebContents() { 62 void OpenMediaRouterDialogAndWaitForNewWebContents() {
58 content::TestNavigationObserver nav_observer(NULL); 63 content::TestNavigationObserver nav_observer(NULL);
59 nav_observer.StartWatchingNewWebContents(); 64 nav_observer.StartWatchingNewWebContents();
60 65
61 AppMenuButton* app_menu_button = 66 AppMenuButton* app_menu_button = GetAppMenuButton();
62 BrowserView::GetBrowserViewForBrowser(browser())
63 ->toolbar()
64 ->app_menu_button();
65 67
66 // When the Media Router Action executes, it opens a dialog with web 68 // When the Media Router Action executes, it opens a dialog with web
67 // contents to chrome://media-router. 69 // contents to chrome://media-router.
68 base::ThreadTaskRunnerHandle::Get()->PostTask( 70 base::ThreadTaskRunnerHandle::Get()->PostTask(
69 FROM_HERE, 71 FROM_HERE,
70 base::Bind(&MediaRouterUIBrowserTest::ExecuteMediaRouterAction, 72 base::Bind(&MediaRouterUIBrowserTest::ExecuteMediaRouterAction,
71 base::Unretained(this), app_menu_button)); 73 base::Unretained(this), app_menu_button));
72 app_menu_button->ShowMenu(false); 74 app_menu_button->ShowMenu(false);
73 75
74 nav_observer.Wait(); 76 nav_observer.Wait();
(...skipping 20 matching lines...) Expand all
95 ComponentToolbarActionsFactory::kMediaRouterActionId); 97 ComponentToolbarActionsFactory::kMediaRouterActionId);
96 } 98 }
97 99
98 void SetAlwaysShowActionPref(bool always_show) { 100 void SetAlwaysShowActionPref(bool always_show) {
99 return ToolbarActionsModel::Get(browser()->profile()) 101 return ToolbarActionsModel::Get(browser()->profile())
100 ->component_migration_helper() 102 ->component_migration_helper()
101 ->SetComponentActionPref( 103 ->SetComponentActionPref(
102 ComponentToolbarActionsFactory::kMediaRouterActionId, always_show); 104 ComponentToolbarActionsFactory::kMediaRouterActionId, always_show);
103 } 105 }
104 106
107 AppMenuButton* GetAppMenuButton() {
108 return BrowserView::GetBrowserViewForBrowser(browser())
109 ->toolbar()
110 ->app_menu_button();
111 }
112
105 protected: 113 protected:
106 ToolbarActionsBar* toolbar_actions_bar_ = nullptr; 114 ToolbarActionsBar* toolbar_actions_bar_ = nullptr;
107 115
108 Issue issue_; 116 Issue issue_;
109 117
110 // A vector of MediaRoutes that includes a local route. 118 // A vector of MediaRoutes that includes a local route.
111 std::vector<MediaRoute> routes_; 119 std::vector<MediaRoute> routes_;
112 120
113 MediaRouterActionController* action_controller_ = nullptr; 121 MediaRouterActionController* action_controller_ = nullptr;
114 }; 122 };
(...skipping 23 matching lines...) Expand all
138 // Navigate away. 146 // Navigate away.
139 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); 147 ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
140 148
141 // The navigation should have removed the previously created dialog. 149 // The navigation should have removed the previously created dialog.
142 // We expect a new dialog WebContents to be created by calling this. 150 // We expect a new dialog WebContents to be created by calling this.
143 OpenMediaRouterDialogAndWaitForNewWebContents(); 151 OpenMediaRouterDialogAndWaitForNewWebContents();
144 152
145 SetAlwaysShowActionPref(false); 153 SetAlwaysShowActionPref(false);
146 } 154 }
147 155
156 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest, OpenDialogFromContextMenu) {
157 // Start with one tab showing ablut:blank.
apacible 2017/01/11 23:23:01 nit: about.
takumif 2017/01/12 00:48:25 Oops. Fixed.
158 ASSERT_EQ(1, browser()->tab_strip_model()->count());
159
160 content::WebContents* web_contents =
161 browser()->tab_strip_model()->GetActiveWebContents();
162 MediaRouterDialogController* dialog_controller =
163 MediaRouterDialogController::GetOrCreateForWebContents(
164 browser()->tab_strip_model()->GetActiveWebContents());
165 content::ContextMenuParams params;
166 params.page_url = web_contents->GetController().GetActiveEntry()->GetURL();
167 TestRenderViewContextMenu menu(web_contents->GetMainFrame(), params);
168 menu.Init();
169
170 ASSERT_TRUE(menu.IsItemPresent(IDC_ROUTE_MEDIA));
171 ASSERT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
172 menu.ExecuteCommand(IDC_ROUTE_MEDIA, 0);
173 EXPECT_TRUE(dialog_controller->IsShowingMediaRouterDialog());
174 }
175
176 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest, OpenDialogFromAppMenu) {
177 // Start with one tab showing ablut:blank.
apacible 2017/01/11 23:23:01 nit: about.
takumif 2017/01/12 00:48:25 Done.
178 ASSERT_EQ(1, browser()->tab_strip_model()->count());
179
180 AppMenuButton* menu_button = GetAppMenuButton();
181 base::RunLoop run_loop;
182 menu_button->ShowMenu(false);
183 run_loop.RunUntilIdle();
184
185 MediaRouterDialogController* dialog_controller =
186 MediaRouterDialogController::GetOrCreateForWebContents(
187 browser()->tab_strip_model()->GetActiveWebContents());
188 ASSERT_FALSE(dialog_controller->IsShowingMediaRouterDialog());
189 menu_button->app_menu_for_testing()->ExecuteCommand(IDC_ROUTE_MEDIA, 0);
190 EXPECT_TRUE(dialog_controller->IsShowingMediaRouterDialog());
191 }
192
148 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest, 193 IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
149 EphemeralToolbarIconForRoutesAndIssues) { 194 EphemeralToolbarIconForRoutesAndIssues) {
150 action_controller_->OnIssue(issue_); 195 action_controller_->OnIssue(issue_);
151 EXPECT_TRUE(ActionExists()); 196 EXPECT_TRUE(ActionExists());
152 action_controller_->OnIssuesCleared(); 197 action_controller_->OnIssuesCleared();
153 EXPECT_FALSE(ActionExists()); 198 EXPECT_FALSE(ActionExists());
154 199
155 action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>()); 200 action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>());
156 EXPECT_TRUE(ActionExists()); 201 EXPECT_TRUE(ActionExists());
157 action_controller_->OnRoutesUpdated(std::vector<MediaRoute>(), 202 action_controller_->OnRoutesUpdated(std::vector<MediaRoute>(),
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 action_controller_->OnRoutesUpdated(std::vector<MediaRoute>(), 255 action_controller_->OnRoutesUpdated(std::vector<MediaRoute>(),
211 std::vector<MediaRoute::Id>()); 256 std::vector<MediaRoute::Id>());
212 EXPECT_FALSE(ActionExists()); 257 EXPECT_FALSE(ActionExists());
213 action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>()); 258 action_controller_->OnRoutesUpdated(routes_, std::vector<MediaRoute::Id>());
214 EXPECT_TRUE(ActionExists()); 259 EXPECT_TRUE(ActionExists());
215 browser2->window()->Close(); 260 browser2->window()->Close();
216 EXPECT_TRUE(ActionExists()); 261 EXPECT_TRUE(ActionExists());
217 } 262 }
218 263
219 } // namespace media_router 264 } // namespace media_router
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698