chrome/browser/popup_blocker_browsertest.cc - Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4].

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 5104002: Cleanup: Include browser.h -> ui/browser.h [Part 4]. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 years, 1 month 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

« no previous file with comments | « chrome/browser/in_process_webkit/indexed_db_browsertest.cc ('k') | chrome/browser/process_singleton_linux_uitest.cc » ('j') | no next file with comments »

OLD	NEW
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.h"

11 #include "chrome/browser/browser_list.h"	10 #include "chrome/browser/browser_list.h"

12 #include "chrome/browser/browser_window.h"	11 #include "chrome/browser/browser_window.h"

13 #include "chrome/browser/profile.h"	12 #include "chrome/browser/profile.h"

14 #include "chrome/browser/tab_contents/tab_contents.h"	13 #include "chrome/browser/tab_contents/tab_contents.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"	16 #include "chrome/common/chrome_switches.h"

17 #include "chrome/test/in_process_browser_test.h"	17 #include "chrome/test/in_process_browser_test.h"

18 #include "chrome/test/ui_test_utils.h"	18 #include "chrome/test/ui_test_utils.h"

19 #include "testing/gtest/include/gtest/gtest.h"	19 #include "testing/gtest/include/gtest/gtest.h"

20	20

21 namespace {	21 namespace {

22	22

23 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker");	23 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker");

24	24

(...skipping 10 matching lines...) Expand all Loading...
35 // to the original URL.	35 // to the original URL.

36 EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));	36 EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));

37 EXPECT_EQ(1, browser()->tab_count());	37 EXPECT_EQ(1, browser()->tab_count());

38 TabContents* cur_tab = browser()->GetSelectedTabContents();	38 TabContents* cur_tab = browser()->GetSelectedTabContents();

39 ASSERT_TRUE(cur_tab);	39 ASSERT_TRUE(cur_tab);

40 EXPECT_EQ(url, cur_tab->GetURL());	40 EXPECT_EQ(url, cur_tab->GetURL());

41 }	41 }

42	42

43 } // namespace	43 } // namespace

44	44

OLD	NEW