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

Side by Side Diff: chrome/browser/popup_blocker_browsertest.cc

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/browser_list.h" 10 #include "chrome/browser/browser_list.h"
11 #include "chrome/browser/browser_window.h" 11 #include "chrome/browser/browser_window.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/tab_contents/tab_contents.h" 13 #include "chrome/browser/tab_contents/tab_contents.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "chrome/common/chrome_switches.h"
17 #include "chrome/test/in_process_browser_test.h" 16 #include "chrome/test/in_process_browser_test.h"
18 #include "chrome/test/ui_test_utils.h" 17 #include "chrome/test/ui_test_utils.h"
19 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
20 19
21 namespace { 20 namespace {
22 21
23 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker"); 22 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker");
24 23
25 typedef InProcessBrowserTest PopupBlockerBrowserTest; 24 typedef InProcessBrowserTest PopupBlockerBrowserTest;
26 25
27 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) { 26 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) {
28 FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html")); 27 FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html"));
29 FilePath test_dir(kTestDir); 28 FilePath test_dir(kTestDir);
30 GURL url(ui_test_utils::GetTestUrl(test_dir, file_name)); 29 GURL url(ui_test_utils::GetTestUrl(test_dir, file_name));
31 ui_test_utils::NavigateToURL(browser(), url); 30 ui_test_utils::NavigateToURL(browser(), url);
32 31
33 // If the popup blocker blocked the blank post, there should be only one 32 // If the popup blocker blocked the blank post, there should be only one
34 // tab in only one browser window and the URL of current tab must be equal 33 // tab in only one browser window and the URL of current tab must be equal
35 // to the original URL. 34 // to the original URL.
36 EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile())); 35 EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
37 EXPECT_EQ(1, browser()->tab_count()); 36 EXPECT_EQ(1, browser()->tab_count());
38 TabContents* cur_tab = browser()->GetSelectedTabContents(); 37 TabContents* cur_tab = browser()->GetSelectedTabContents();
39 ASSERT_TRUE(cur_tab); 38 ASSERT_TRUE(cur_tab);
40 EXPECT_EQ(url, cur_tab->GetURL()); 39 EXPECT_EQ(url, cur_tab->GetURL());
41 } 40 }
42 41
43 } // namespace 42 } // namespace
44
OLDNEW
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store_unittest.cc ('k') | chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698