chrome/browser/profiles/off_the_record_profile_impl_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/profiles/off_the_record_profile_impl_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

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/profiles/off_the_record_profile_impl.h"	5 #include "chrome/browser/profiles/off_the_record_profile_impl.h"

6	6

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

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

7 #include "chrome/browser/net/ssl_config_service_manager.h"	9 #include "chrome/browser/net/ssl_config_service_manager.h"

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

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

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

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

12 #include "chrome/browser/profiles/profile_dependency_manager.h"	12 #include "chrome/browser/profiles/profile_dependency_manager.h"

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

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

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

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

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

18 #include "content/public/browser/host_zoom_map.h"	18 #include "content/public/browser/host_zoom_map.h"

19	19

20 using content::HostZoomMap;	20 using content::HostZoomMap;

(...skipping 143 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164 child_zoom_map->GetZoomLevel(host)) <<	164 child_zoom_map->GetZoomLevel(host)) <<

165 "Child change must not propagate to parent.";	165 "Child change must not propagate to parent.";

166	166

167 parent_zoom_map->SetZoomLevel(host, zoom_level_40);	167 parent_zoom_map->SetZoomLevel(host, zoom_level_40);

168 ASSERT_EQ(parent_zoom_map->GetZoomLevel(host), zoom_level_40);	168 ASSERT_EQ(parent_zoom_map->GetZoomLevel(host), zoom_level_40);

169	169

170 EXPECT_EQ(parent_zoom_map->GetZoomLevel(host),	170 EXPECT_EQ(parent_zoom_map->GetZoomLevel(host),

171 child_zoom_map->GetZoomLevel(host)) <<	171 child_zoom_map->GetZoomLevel(host)) <<

172 "Parent change should propagate to child.";	172 "Parent change should propagate to child.";

173 }	173 }

OLD	NEW