components/syncable_prefs/pref_service_syncable_unittest.cc - Issue 1305213009: Componentize PrefSyncableService and support classes.

Side by Side Diff: components/syncable_prefs/pref_service_syncable_unittest.cc

Issue 1305213009: Componentize PrefSyncableService and support classes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pref_service_syncable

Patch Set: Add missing dependency on //sync:test_support_sync_api for unit tests with gn Created 5 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/prefs/pref_service_syncable.h"	5 #include "components/syncable_prefs/pref_service_syncable.h"

6	6

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

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

9 #include "base/json/json_writer.h"	9 #include "base/json/json_writer.h"

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

11 #include "base/prefs/scoped_user_pref_update.h"	11 #include "base/prefs/scoped_user_pref_update.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

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

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

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

16 #include "components/pref_registry/pref_registry_syncable.h"	13 #include "components/pref_registry/pref_registry_syncable.h"

	14 #include "components/syncable_prefs/pref_model_associator.h"

	15 #include "components/syncable_prefs/pref_model_associator_client.h"

	16 #include "components/syncable_prefs/testing_pref_service_syncable.h"

17 #include "sync/api/attachments/attachment_id.h"	17 #include "sync/api/attachments/attachment_id.h"

18 #include "sync/api/sync_change.h"	18 #include "sync/api/sync_change.h"

19 #include "sync/api/sync_data.h"	19 #include "sync/api/sync_data.h"

20 #include "sync/api/sync_error_factory_mock.h"	20 #include "sync/api/sync_error_factory_mock.h"

21 #include "sync/api/syncable_service.h"	21 #include "sync/api/syncable_service.h"

22 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"	22 #include "sync/internal_api/public/attachments/attachment_service_proxy_for_test .h"

23 #include "sync/protocol/preference_specifics.pb.h"	23 #include "sync/protocol/preference_specifics.pb.h"

24 #include "sync/protocol/sync.pb.h"	24 #include "sync/protocol/sync.pb.h"

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

26	26

(...skipping 705 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
732	732

733 scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();	733 scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();

734 syncer::SyncChangeList list;	734 syncer::SyncChangeList list;

735 list.push_back(MakeRemoteChange(	735 list.push_back(MakeRemoteChange(

736 1, kStringPrefName, *null_value, SyncChange::ACTION_DELETE));	736 1, kStringPrefName, *null_value, SyncChange::ACTION_DELETE));

737 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);	737 pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);

738 EXPECT_TRUE(pref->IsDefaultValue());	738 EXPECT_TRUE(pref->IsDefaultValue());

739 }	739 }

740	740

741 } // namespace	741 } // namespace

OLD	NEW