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

Unified Diff: chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc

Issue 1149893020: [Media Router] Implement MediaRouterAction + MediaRouterUI tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed pkasting's 2nd comments Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
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
new file mode 100644
index 0000000000000000000000000000000000000000..249042b03c39315d87a1cb9901c8b54b95f20bf8
--- /dev/null
+++ b/chrome/browser/ui/views/media_router/media_router_ui_browsertest.cc
@@ -0,0 +1,89 @@
+// Copyright 2015 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 "chrome/browser/ui/browser.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"
+#include "chrome/browser/ui/toolbar/toolbar_action_view_delegate.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
+#include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_action_view.h"
+#include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/test_navigation_observer.h"
+#include "content/public/test/test_utils.h"
+
+namespace media_router {
+
+class MediaRouterUIBrowserTest : public InProcessBrowserTest {
+ public:
+ MediaRouterUIBrowserTest() {}
+ ~MediaRouterUIBrowserTest() override {}
+
+ void SetUpOnMainThread() override {
+ InProcessBrowserTest::SetUpOnMainThread();
+
+ BrowserActionsContainer* browser_actions_container =
+ BrowserView::GetBrowserViewForBrowser(browser())
+ ->toolbar()
+ ->browser_actions();
+ ASSERT_TRUE(browser_actions_container);
+
+ media_router_action_.reset(new MediaRouterAction);
+
+ // Sets delegate on |media_router_action_|.
+ toolbar_action_view_.reset(
+ new ToolbarActionView(media_router_action_.get(), browser()->profile(),
+ browser_actions_container));
+ }
+
+ void OpenMediaRouterDialogAndWaitForNewWebContents() {
+ content::TestNavigationObserver nav_observer(NULL);
+ nav_observer.StartWatchingNewWebContents();
+ media_router_action_->ExecuteAction(true);
+ nav_observer.Wait();
+ nav_observer.StopWatchingNewWebContents();
+ }
+
+ protected:
+ // Must be initialized after |InProcessBrowserTest::SetUpOnMainThread|.
+ scoped_ptr<MediaRouterAction> media_router_action_;
+
+ // ToolbarActionView constructed to set the delegate on |mr_action|.
+ scoped_ptr<ToolbarActionView> toolbar_action_view_;
+};
+
+IN_PROC_BROWSER_TEST_F(MediaRouterUIBrowserTest,
+ OpenDialogWithMediaRouterAction) {
+ // We start off at about:blank page.
+ // Make sure there is 1 tab and media router is enabled.
+ ASSERT_EQ(1, browser()->tab_strip_model()->count());
+
+ OpenMediaRouterDialogAndWaitForNewWebContents();
+
+ // Reload the browser and wait.
+ content::TestNavigationObserver reload_observer(
+ browser()->tab_strip_model()->GetActiveWebContents());
+ chrome::Reload(browser(), CURRENT_TAB);
+ reload_observer.Wait();
+
+ // The reload should have removed the previously created dialog.
+ // We expect a new dialog WebContents to be created by calling this.
+ OpenMediaRouterDialogAndWaitForNewWebContents();
+
+ // Navigate away and wait.
+ content::TestNavigationObserver nav_observer(
+ browser()->tab_strip_model()->GetActiveWebContents(), 1);
+ ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
+ nav_observer.Wait();
+
+ // The navigation should have removed the previously created dialog.
+ // We expect a new dialog WebContents to be created by calling this.
+ OpenMediaRouterDialogAndWaitForNewWebContents();
+}
+
+} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698