chrome/browser/history/history_browsertest.cc - Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/.

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/history/history_browsertest.cc

Issue 12211105: Move remaining non-test, non-Chrome-specific Prefs code to base/prefs/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address review comments, merge to LKGR. 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

« no previous file with comments | « chrome/browser/gpu/gl_string_manager.cc ('k') | chrome/browser/history/history_service.cc » ('j') | no next file with comments »

OLD	NEW
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 #include <vector>	5 #include <vector>

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/message_loop.h"	9 #include "base/message_loop.h"

	10 #include "base/prefs/pref_service.h"

10 #include "base/utf_string_conversions.h"	11 #include "base/utf_string_conversions.h"

11 #include "chrome/app/chrome_command_ids.h"	12 #include "chrome/app/chrome_command_ids.h"

12 #include "chrome/browser/history/history_db_task.h"	13 #include "chrome/browser/history/history_db_task.h"

13 #include "chrome/browser/history/history_service.h"	14 #include "chrome/browser/history/history_service.h"

14 #include "chrome/browser/history/history_service_factory.h"	15 #include "chrome/browser/history/history_service_factory.h"

15 #include "chrome/browser/prefs/pref_service.h"

16 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/ui/browser.h"	17 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/browser_commands.h"	18 #include "chrome/browser/ui/browser_commands.h"

19 #include "chrome/browser/ui/tabs/tab_strip_model.h"	19 #include "chrome/browser/ui/tabs/tab_strip_model.h"

20 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

21 #include "chrome/common/pref_names.h"	21 #include "chrome/common/pref_names.h"

22 #include "chrome/common/url_constants.h"	22 #include "chrome/common/url_constants.h"

23 #include "chrome/test/base/in_process_browser_test.h"	23 #include "chrome/test/base/in_process_browser_test.h"

24 #include "chrome/test/base/ui_test_utils.h"	24 #include "chrome/test/base/ui_test_utils.h"

25 #include "content/public/browser/web_contents.h"	25 #include "content/public/browser/web_contents.h"

(...skipping 474 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
500	500

501 content::WebContents* active_web_contents =	501 content::WebContents* active_web_contents =

502 browser()->tab_strip_model()->GetActiveWebContents();	502 browser()->tab_strip_model()->GetActiveWebContents();

503 ASSERT_EQ(web_contents, active_web_contents);	503 ASSERT_EQ(web_contents, active_web_contents);

504 ASSERT_EQ(history_url, active_web_contents->GetURL());	504 ASSERT_EQ(history_url, active_web_contents->GetURL());

505	505

506 content::WebContents* second_tab =	506 content::WebContents* second_tab =

507 browser()->tab_strip_model()->GetWebContentsAt(1);	507 browser()->tab_strip_model()->GetWebContentsAt(1);

508 ASSERT_NE(history_url, second_tab->GetURL());	508 ASSERT_NE(history_url, second_tab->GetURL());

509 }	509 }

OLD	NEW