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

Side by Side Diff: chrome/browser/ui/cocoa/content_settings/collected_cookies_mac_browsertest.mm

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 7 years, 10 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h" 5 #import "chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h"
6 6
7 #include "chrome/browser/ui/browser_tabstrip.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" 9 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
9 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
10 #include "content/public/test/test_utils.h" 11 #include "content/public/test/test_utils.h"
11 12
12 typedef InProcessBrowserTest CollectedCookiesMacTest; 13 typedef InProcessBrowserTest CollectedCookiesMacTest;
13 14
14 IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Close) { 15 IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Close) {
15 content::WebContents* web_contents = chrome::GetActiveWebContents(browser()); 16 content::WebContents* web_contents =
17 browser()->tab_strip_model()->GetActiveWebContents();
16 WebContentsModalDialogManager* web_contents_modal_dialog_manager = 18 WebContentsModalDialogManager* web_contents_modal_dialog_manager =
17 WebContentsModalDialogManager::FromWebContents(web_contents); 19 WebContentsModalDialogManager::FromWebContents(web_contents);
18 EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog()); 20 EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());
19 21
20 // Deletes itself. 22 // Deletes itself.
21 CollectedCookiesMac* dialog = 23 CollectedCookiesMac* dialog = new CollectedCookiesMac(
22 new CollectedCookiesMac(chrome::GetActiveWebContents(browser())); 24 browser()->tab_strip_model()->GetActiveWebContents());
23 EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog()); 25 EXPECT_TRUE(web_contents_modal_dialog_manager->IsShowingDialog());
24 26
25 dialog->PerformClose(); 27 dialog->PerformClose();
26 content::RunAllPendingInMessageLoop(); 28 content::RunAllPendingInMessageLoop();
27 EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog()); 29 EXPECT_FALSE(web_contents_modal_dialog_manager->IsShowingDialog());
28 } 30 }
29 31
30 IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Outlets) { 32 IN_PROC_BROWSER_TEST_F(CollectedCookiesMacTest, Outlets) {
31 // Deletes itself. 33 // Deletes itself.
32 CollectedCookiesMac* dialog = 34 CollectedCookiesMac* dialog = new CollectedCookiesMac(
33 new CollectedCookiesMac(chrome::GetActiveWebContents(browser())); 35 browser()->tab_strip_model()->GetActiveWebContents());
34 CollectedCookiesWindowController* sheet_controller = 36 CollectedCookiesWindowController* sheet_controller =
35 dialog->sheet_controller(); 37 dialog->sheet_controller();
36 38
37 EXPECT_TRUE([sheet_controller allowedTreeController]); 39 EXPECT_TRUE([sheet_controller allowedTreeController]);
38 EXPECT_TRUE([sheet_controller blockedTreeController]); 40 EXPECT_TRUE([sheet_controller blockedTreeController]);
39 EXPECT_TRUE([sheet_controller allowedOutlineView]); 41 EXPECT_TRUE([sheet_controller allowedOutlineView]);
40 EXPECT_TRUE([sheet_controller blockedOutlineView]); 42 EXPECT_TRUE([sheet_controller blockedOutlineView]);
41 EXPECT_TRUE([sheet_controller infoBar]); 43 EXPECT_TRUE([sheet_controller infoBar]);
42 EXPECT_TRUE([sheet_controller infoBarIcon]); 44 EXPECT_TRUE([sheet_controller infoBarIcon]);
43 EXPECT_TRUE([sheet_controller infoBarText]); 45 EXPECT_TRUE([sheet_controller infoBarText]);
44 EXPECT_TRUE([sheet_controller tabView]); 46 EXPECT_TRUE([sheet_controller tabView]);
45 EXPECT_TRUE([sheet_controller blockedScrollView]); 47 EXPECT_TRUE([sheet_controller blockedScrollView]);
46 EXPECT_TRUE([sheet_controller blockedCookiesText]); 48 EXPECT_TRUE([sheet_controller blockedCookiesText]);
47 EXPECT_TRUE([sheet_controller cookieDetailsViewPlaceholder]); 49 EXPECT_TRUE([sheet_controller cookieDetailsViewPlaceholder]);
48 50
49 [sheet_controller closeSheet:nil]; 51 [sheet_controller closeSheet:nil];
50 content::RunAllPendingInMessageLoop(); 52 content::RunAllPendingInMessageLoop();
51 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698