Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: chrome/browser/sync/test/integration/two_client_uss_sync_test.cc

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. Created 4 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 "base/macros.h" 5 #include "base/macros.h"
6 #include "base/memory/ptr_util.h" 6 #include "base/memory/ptr_util.h"
7 #include "base/threading/thread_task_runner_handle.h" 7 #include "base/threading/thread_task_runner_handle.h"
8 #include "chrome/browser/sync/chrome_sync_client.h" 8 #include "chrome/browser/sync/chrome_sync_client.h"
9 #include "chrome/browser/sync/profile_sync_service_factory.h" 9 #include "chrome/browser/sync/profile_sync_service_factory.h"
10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
11 #include "chrome/browser/sync/test/integration/status_change_checker.h" 11 #include "chrome/browser/sync/test/integration/status_change_checker.h"
12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
13 #include "chrome/browser/sync/test/integration/sync_test.h" 13 #include "chrome/browser/sync/test/integration/sync_test.h"
14 #include "components/browser_sync/profile_sync_components_factory_impl.h" 14 #include "components/browser_sync/profile_sync_components_factory_impl.h"
15 #include "components/browser_sync/profile_sync_service.h" 15 #include "components/browser_sync/profile_sync_service.h"
16 #include "components/sync/api/fake_model_type_service.h" 16 #include "components/sync/api/fake_model_type_service.h"
17 17
18 using browser_sync::ChromeSyncClient; 18 using browser_sync::ChromeSyncClient;
19 using browser_sync::ProfileSyncComponentsFactoryImpl;
19 using syncer_v2::FakeModelTypeService; 20 using syncer_v2::FakeModelTypeService;
20 using syncer_v2::ModelTypeService; 21 using syncer_v2::ModelTypeService;
21 using syncer_v2::SharedModelTypeProcessor; 22 using syncer_v2::SharedModelTypeProcessor;
22 23
23 const char kKey1[] = "key1"; 24 const char kKey1[] = "key1";
24 const char kValue1[] = "value1"; 25 const char kValue1[] = "value1";
25 const char kValue2[] = "value2"; 26 const char kValue2[] = "value2";
26 const char kResolutionValue[] = "RESOLVED"; 27 const char kResolutionValue[] = "RESOLVED";
27 28
28 // A ChromeSyncClient that provides a ModelTypeService for PREFERENCES. 29 // A ChromeSyncClient that provides a ModelTypeService for PREFERENCES.
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 296
296 // Write conflicting entities. 297 // Write conflicting entities.
297 model1->WriteItem(kKey1, kValue1); 298 model1->WriteItem(kKey1, kValue1);
298 model2->WriteItem(kKey1, kValue2); 299 model2->WriteItem(kKey1, kValue2);
299 300
300 // Wait for them to be resolved to kResolutionValue by the custom conflict 301 // Wait for them to be resolved to kResolutionValue by the custom conflict
301 // resolution logic in TestModelTypeService. 302 // resolution logic in TestModelTypeService.
302 ASSERT_TRUE(DataChecker(model1, kKey1, kResolutionValue).Wait()); 303 ASSERT_TRUE(DataChecker(model1, kKey1, kResolutionValue).Wait());
303 ASSERT_TRUE(DataChecker(model2, kKey1, kResolutionValue).Wait()); 304 ASSERT_TRUE(DataChecker(model2, kKey1, kResolutionValue).Wait());
304 } 305 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698