chrome/browser/sync/profile_sync_service_preference_unittest.cc - Issue 7879006: Delete Tracked, and move Location to its own file.

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/sync/profile_sync_service_preference_unittest.cc

Issue 7879006: Delete Tracked, and move Location to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebased Created 9 years, 3 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/sync/profile_sync_service_password_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_session_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <map>	5 #include <map>

6 #include <string>	6 #include <string>

7	7

8 #include "base/json/json_reader.h"	8 #include "base/json/json_reader.h"

	9 #include "base/location.h"

9 #include "base/stl_util.h"	10 #include "base/stl_util.h"

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

11 #include "base/task.h"	12 #include "base/task.h"

12 #include "base/tracked.h"

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

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

15 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"	15 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"

16 #include "chrome/browser/sync/api/sync_data.h"	16 #include "chrome/browser/sync/api/sync_data.h"

17 #include "chrome/browser/sync/glue/generic_change_processor.h"	17 #include "chrome/browser/sync/glue/generic_change_processor.h"

18 #include "chrome/browser/sync/glue/preference_data_type_controller.h"	18 #include "chrome/browser/sync/glue/preference_data_type_controller.h"

19 #include "chrome/browser/sync/glue/syncable_service_adapter.h"	19 #include "chrome/browser/sync/glue/syncable_service_adapter.h"

20 #include "chrome/browser/sync/glue/sync_backend_host.h"	20 #include "chrome/browser/sync/glue/sync_backend_host.h"

21 #include "chrome/browser/sync/internal_api/change_record.h"	21 #include "chrome/browser/sync/internal_api/change_record.h"

22 #include "chrome/browser/sync/internal_api/read_node.h"	22 #include "chrome/browser/sync/internal_api/read_node.h"

(...skipping 509 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
532	532

533 // The pref value should still be the one dictated by policy.	533 // The pref value should still be the one dictated by policy.

534 EXPECT_TRUE(managed_value->Equals(&GetPreferenceValue(prefs::kHomePage)));	534 EXPECT_TRUE(managed_value->Equals(&GetPreferenceValue(prefs::kHomePage)));

535	535

536 // Switch kHomePage back to unmanaged.	536 // Switch kHomePage back to unmanaged.

537 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);	537 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);

538	538

539 // Sync value should be picked up.	539 // Sync value should be picked up.

540 EXPECT_TRUE(sync_value->Equals(&GetPreferenceValue(prefs::kHomePage)));	540 EXPECT_TRUE(sync_value->Equals(&GetPreferenceValue(prefs::kHomePage)));

541 }	541 }

OLD	NEW