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

Unified Diff: chrome/browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc

Issue 1228863005: [MediaRouter] The minimal change to make everything build on Android. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the include for MediaRouterDialogControllerImpl Created 5 years, 5 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/webui/media_router/media_router_dialog_controller_unittest.cc
diff --git a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc b/chrome/browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc
deleted file mode 100644
index 97bba960fe674ec1e7813732d547ab7b5fad7ff2..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/media_router/media_router_dialog_controller_unittest.cc
+++ /dev/null
@@ -1,224 +0,0 @@
-// 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_commands.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/media_router/media_router_dialog_controller.h"
-#include "chrome/browser/ui/webui/media_router/media_router_test.h"
-#include "chrome/browser/ui/webui/media_router/media_router_ui.h"
-#include "content/public/test/browser_test_utils.h"
-
-using content::WebContents;
-
-namespace media_router {
-
-class MediaRouterDialogControllerTest : public MediaRouterTest {
- public:
- MediaRouterDialogControllerTest() {}
- ~MediaRouterDialogControllerTest() override {}
- void OpenMediaRouterDialog();
-
- protected:
- WebContents* initiator_ = nullptr;
- MediaRouterDialogController* dialog_controller_ = nullptr;
- WebContents* media_router_dialog_ = nullptr;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogControllerTest);
-};
-
-void MediaRouterDialogControllerTest::OpenMediaRouterDialog() {
- // Start with one window with one tab.
- EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
- EXPECT_EQ(0, browser()->tab_strip_model()->count());
- chrome::NewTab(browser());
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
-
- // Create a reference to initiator contents.
- initiator_ = browser()->tab_strip_model()->GetActiveWebContents();
-
- MediaRouterDialogController::CreateForWebContents(initiator_);
- dialog_controller_ = MediaRouterDialogController::FromWebContents(initiator_);
- ASSERT_TRUE(dialog_controller_);
-
- // Get the media router dialog for the initiator.
- media_router_dialog_ = dialog_controller_->ShowMediaRouterDialog();
- ASSERT_TRUE(media_router_dialog_);
-
- // New media router dialog is a constrained window, so the number of
- // tabs is still 1.
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
- EXPECT_NE(initiator_, media_router_dialog_);
- EXPECT_EQ(media_router_dialog_, dialog_controller_->GetMediaRouterDialog());
-}
-
-// Create/Get a media router dialog for initiator.
-TEST_F(MediaRouterDialogControllerTest, ShowMediaRouterDialog) {
- OpenMediaRouterDialog();
-
- // Show media router dialog for the same initiator again.
- WebContents* same_media_router_dialog =
- dialog_controller_->ShowMediaRouterDialog();
-
- // Tab count remains the same.
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
-
- // Media router dialog already exists. Calling |ShowMediaRouterDialog| again
- // should not have created a new media router dialog.
- EXPECT_EQ(media_router_dialog_, same_media_router_dialog);
-}
-
-// Tests multiple media router dialogs exist in the same browser for different
-// initiators. If a dialog already exists for an initiator, that initiator
-// gets focused.
-TEST_F(MediaRouterDialogControllerTest, MultipleMediaRouterDialogs) {
- // Let's start with one window and two tabs.
- EXPECT_EQ(1u, chrome::GetTotalBrowserCount());
- TabStripModel* tab_strip_model = browser()->tab_strip_model();
- ASSERT_TRUE(tab_strip_model);
-
- EXPECT_EQ(0, tab_strip_model->count());
-
- // Create some new initiators.
- chrome::NewTab(browser());
- WebContents* web_contents_1 = tab_strip_model->GetActiveWebContents();
- ASSERT_TRUE(web_contents_1);
-
- chrome::NewTab(browser());
- WebContents* web_contents_2 = tab_strip_model->GetActiveWebContents();
- ASSERT_TRUE(web_contents_2);
- EXPECT_EQ(2, tab_strip_model->count());
-
-
- // Create media router dialog for |web_contents_1|.
- MediaRouterDialogController::CreateForWebContents(web_contents_1);
- MediaRouterDialogController* dialog_controller_1 =
- MediaRouterDialogController::FromWebContents(web_contents_1);
- ASSERT_TRUE(dialog_controller_1);
-
- WebContents* media_router_dialog_1 =
- dialog_controller_1->ShowMediaRouterDialog();
- ASSERT_TRUE(media_router_dialog_1);
-
- EXPECT_NE(web_contents_1, media_router_dialog_1);
- EXPECT_EQ(2, tab_strip_model->count());
-
- // Create media router dialog for |web_contents_2|.
- MediaRouterDialogController::CreateForWebContents(web_contents_2);
- MediaRouterDialogController* dialog_controller_2 =
- MediaRouterDialogController::FromWebContents(web_contents_2);
- ASSERT_TRUE(dialog_controller_2);
-
- WebContents* media_router_dialog_2 =
- dialog_controller_2->ShowMediaRouterDialog();
- ASSERT_TRUE(media_router_dialog_2);
-
- EXPECT_NE(web_contents_2, media_router_dialog_2);
- EXPECT_NE(media_router_dialog_1, media_router_dialog_2);
-
- // 2 initiators and 2 dialogs exist in the same browser. The dialogs are
- // constrained in their respective initiators.
- EXPECT_EQ(2, tab_strip_model->count());
-
- int tab_1_index = tab_strip_model->GetIndexOfWebContents(web_contents_1);
- int tab_2_index = tab_strip_model->GetIndexOfWebContents(web_contents_2);
- int media_router_dialog_1_index =
- tab_strip_model->GetIndexOfWebContents(media_router_dialog_1);
- int media_router_dialog_2_index =
- tab_strip_model->GetIndexOfWebContents(media_router_dialog_2);
-
- // Constrained dialogs are not in the TabStripModel.
- EXPECT_EQ(-1, media_router_dialog_1_index);
- EXPECT_EQ(-1, media_router_dialog_2_index);
-
- // Since |media_router_dialog_2_index| was the most recently created dialog,
- // its initiator should have focus.
- EXPECT_EQ(tab_2_index, tab_strip_model->active_index());
-
- // When we get the media router dialog for |web_contents_1|,
- // |media_router_dialog_1| is activated and focused.
- dialog_controller_1->ShowMediaRouterDialog();
- EXPECT_EQ(tab_1_index, tab_strip_model->active_index());
-
- // When we get the media router dialog for |web_contents_2|,
- // |media_router_dialog_2| is activated and focused.
- dialog_controller_2->ShowMediaRouterDialog();
- EXPECT_EQ(tab_2_index, tab_strip_model->active_index());
-}
-
-TEST_F(MediaRouterDialogControllerTest, CloseDialogFromWebUI) {
- OpenMediaRouterDialog();
-
- // Close the dialog.
- content::WebContentsDestroyedWatcher watcher(media_router_dialog_);
-
- content::WebUI* web_ui = media_router_dialog_->GetWebUI();
- ASSERT_TRUE(web_ui);
- MediaRouterUI* media_router_ui =
- static_cast<MediaRouterUI*>(web_ui->GetController());
- ASSERT_TRUE(media_router_ui);
- media_router_ui->Close();
-
- // Blocks until the media router dialog WebContents has been destroyed.
- watcher.Wait();
-
- // Still 1 tab in the browser.
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
-
- // Entry has been removed.
- EXPECT_FALSE(dialog_controller_->GetMediaRouterDialog());
-
- // Show the media router dialog again, creating a new one.
- WebContents* media_router_dialog_2 =
- dialog_controller_->ShowMediaRouterDialog();
-
- // Still 1 tab in the browser.
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
-
- EXPECT_EQ(media_router_dialog_2, dialog_controller_->GetMediaRouterDialog());
-}
-
-TEST_F(MediaRouterDialogControllerTest, CloseDialogFromDialogController) {
- OpenMediaRouterDialog();
-
- // Close the dialog.
- content::WebContentsDestroyedWatcher watcher(media_router_dialog_);
-
- dialog_controller_->CloseMediaRouterDialog();
-
- // Blocks until the media router dialog WebContents has been destroyed.
- watcher.Wait();
-
- // Still 1 tab in the browser.
- EXPECT_EQ(1, browser()->tab_strip_model()->count());
-
- // Entry has been removed.
- EXPECT_FALSE(dialog_controller_->GetMediaRouterDialog());
-}
-
-TEST_F(MediaRouterDialogControllerTest, CloseInitiator) {
- OpenMediaRouterDialog();
-
- // Close the initiator. This should also close the dialog WebContents.
- content::WebContentsDestroyedWatcher initiator_watcher(initiator_);
- content::WebContentsDestroyedWatcher dialog_watcher(media_router_dialog_);
-
- int initiator_index = browser()->tab_strip_model()
- ->GetIndexOfWebContents(initiator_);
- EXPECT_NE(-1, initiator_index);
- EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt(
- initiator_index, TabStripModel::CLOSE_NONE));
-
- // Blocks until the initiator WebContents has been destroyed.
- initiator_watcher.Wait();
- dialog_watcher.Wait();
-
- // No tabs in the browser.
- EXPECT_EQ(0, browser()->tab_strip_model()->count());
-
- // The dialog controller is deleted when the WebContents is closed/destroyed.
-}
-
-} // namespace media_router

Powered by Google App Engine
This is Rietveld 408576698