chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.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/ui/tab_contents/tab_contents_iterator_unittest.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/ui/sync/one_click_signin_sync_starter.cc ('k') | chrome/browser/ui/tabs/pinned_tab_codec.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 "chrome/browser/ui/tab_contents/tab_contents_iterator.h"	5 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"

6	6

	7 #include "base/prefs/pref_registry_simple.h"

7 #include "chrome/browser/browser_process.h"	8 #include "chrome/browser/browser_process.h"

8 #include "chrome/browser/browser_shutdown.h"	9 #include "chrome/browser/browser_shutdown.h"

9 #include "chrome/browser/prefs/pref_registry_simple.h"

10 #include "chrome/browser/profiles/profile_manager.h"	10 #include "chrome/browser/profiles/profile_manager.h"

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

12 #include "chrome/browser/ui/browser_list_impl.h"	12 #include "chrome/browser/ui/browser_list_impl.h"

13 #include "chrome/browser/ui/host_desktop.h"	13 #include "chrome/browser/ui/host_desktop.h"

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

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

16 #include "chrome/test/base/browser_with_test_window_test.h"	16 #include "chrome/test/base/browser_with_test_window_test.h"

17 #include "chrome/test/base/test_browser_window.h"	17 #include "chrome/test/base/test_browser_window.h"

18 #include "chrome/test/base/testing_browser_process.h"	18 #include "chrome/test/base/testing_browser_process.h"

19 #include "chrome/test/base/testing_pref_service.h"	19 #include "chrome/test/base/testing_pref_service.h"

(...skipping 176 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
196 testing_browser_process->SetProfileManager(profile_manager);	196 testing_browser_process->SetProfileManager(profile_manager);

197	197

198 browser::AttemptRestart();	198 browser::AttemptRestart();

199 // Cancel the effects of us calling browser::AttemptRestart. Otherwise tests	199 // Cancel the effects of us calling browser::AttemptRestart. Otherwise tests

200 // ran after this one will fail.	200 // ran after this one will fail.

201 browser_shutdown::SetTryingToQuit(false);	201 browser_shutdown::SetTryingToQuit(false);

202	202

203 EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));	203 EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));

204 testing_browser_process->SetLocalState(NULL);	204 testing_browser_process->SetLocalState(NULL);

205 }	205 }

OLD	NEW