chrome/browser/sync/profile_sync_service_preference_unittest.cc - Issue 7624009: Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/

Side by Side Diff: chrome/browser/sync/profile_sync_service_preference_unittest.cc

Issue 7624009: Original patch by rlarocque@chromium.org at http://codereview.chromium.org/7633077/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix windows build pt5 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/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/stl_util.h"	9 #include "base/stl_util.h"

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

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

12 #include "base/tracked.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/engine/syncapi.h"

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

19 #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"

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/glue/syncable_service_adapter.h"	21 #include "chrome/browser/sync/internal_api/read_node.h"

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

	23 #include "chrome/browser/sync/internal_api/sync_manager.h"

	24 #include "chrome/browser/sync/internal_api/write_node.h"

	25 #include "chrome/browser/sync/internal_api/write_transaction.h"

22 #include "chrome/browser/sync/profile_sync_test_util.h"	26 #include "chrome/browser/sync/profile_sync_test_util.h"

23 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"	27 #include "chrome/browser/sync/protocol/preference_specifics.pb.h"

24 #include "chrome/browser/sync/syncable/model_type.h"	28 #include "chrome/browser/sync/syncable/model_type.h"

25 #include "chrome/browser/sync/test_profile_sync_service.h"	29 #include "chrome/browser/sync/test_profile_sync_service.h"

26 #include "chrome/common/net/gaia/gaia_constants.h"	30 #include "chrome/common/net/gaia/gaia_constants.h"

27 #include "chrome/common/pref_names.h"	31 #include "chrome/common/pref_names.h"

28 #include "chrome/test/base/testing_pref_service.h"	32 #include "chrome/test/base/testing_pref_service.h"

29 #include "chrome/test/base/testing_profile.h"	33 #include "chrome/test/base/testing_profile.h"

30 #include "content/common/json_value_serializer.h"	34 #include "content/common/json_value_serializer.h"

31 #include "testing/gmock/include/gmock/gmock.h"	35 #include "testing/gmock/include/gmock/gmock.h"

(...skipping 499 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
531	535

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

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

534	538

535 // Switch kHomePage back to unmanaged.	539 // Switch kHomePage back to unmanaged.

536 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);	540 profile_->GetTestingPrefService()->RemoveManagedPref(prefs::kHomePage);

537	541

538 // Sync value should be picked up.	542 // Sync value should be picked up.

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

540 }	544 }

OLD	NEW