chrome/test/base/testing_pref_service.cc - Issue 7537033: Move more files from chrome/test to chrome/test/base, part #5

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/test/base/testing_pref_service.cc

Issue 7537033: Move more files from chrome/test to chrome/test/base, part #5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 4 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/test/base/testing_pref_service.h ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/test/testing_pref_service.h"	5 #include "chrome/test/base/testing_pref_service.h"

6	6

7 #include "chrome/browser/policy/configuration_policy_pref_store.h"	7 #include "chrome/browser/policy/configuration_policy_pref_store.h"

8 #include "chrome/browser/prefs/browser_prefs.h"	8 #include "chrome/browser/prefs/browser_prefs.h"

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

10 #include "chrome/browser/prefs/default_pref_store.h"	10 #include "chrome/browser/prefs/default_pref_store.h"

11 #include "chrome/browser/prefs/pref_notifier.h"	11 #include "chrome/browser/prefs/pref_notifier.h"

12 #include "chrome/browser/prefs/pref_value_store.h"	12 #include "chrome/browser/prefs/pref_value_store.h"

13 #include "chrome/browser/prefs/testing_pref_store.h"	13 #include "chrome/browser/prefs/testing_pref_store.h"

14 #include "chrome/test/testing_browser_process.h"	14 #include "chrome/test/testing_browser_process.h"

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

(...skipping 88 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
104 : browser_process_(browser_process) {	104 : browser_process_(browser_process) {

105 browser::RegisterLocalState(&local_state_);	105 browser::RegisterLocalState(&local_state_);

106 EXPECT_FALSE(browser_process->local_state());	106 EXPECT_FALSE(browser_process->local_state());

107 browser_process->SetLocalState(&local_state_);	107 browser_process->SetLocalState(&local_state_);

108 }	108 }

109	109

110 ScopedTestingLocalState::~ScopedTestingLocalState() {	110 ScopedTestingLocalState::~ScopedTestingLocalState() {

111 EXPECT_EQ(&local_state_, browser_process_->local_state());	111 EXPECT_EQ(&local_state_, browser_process_->local_state());

112 browser_process_->SetLocalState(NULL);	112 browser_process_->SetLocalState(NULL);

113 }	113 }

OLD	NEW