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

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

Issue 2345843003: [Sync] Merge //components/browser_sync into one directory. (Closed)
Patch Set: Address comment + rebase. 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 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "chrome/browser/profiles/profile.h" 7 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/supervised_user/supervised_user_constants.h" 8 #include "chrome/browser/supervised_user/supervised_user_constants.h"
9 #include "chrome/browser/supervised_user/supervised_user_service.h" 9 #include "chrome/browser/supervised_user/supervised_user_service.h"
10 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" 10 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
11 #include "chrome/browser/supervised_user/supervised_user_settings_service.h" 11 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
12 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h" 12 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
13 #include "chrome/browser/sync/profile_sync_service_factory.h" 13 #include "chrome/browser/sync/profile_sync_service_factory.h"
14 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 14 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
15 #include "chrome/browser/sync/test/integration/sync_test.h" 15 #include "chrome/browser/sync/test/integration/sync_test.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/common/chrome_switches.h" 17 #include "chrome/common/chrome_switches.h"
18 #include "components/browser_sync/browser/profile_sync_service.h" 18 #include "components/browser_sync/profile_sync_service.h"
19 #include "components/prefs/pref_service.h" 19 #include "components/prefs/pref_service.h"
20 20
21 class SingleClientSupervisedUserSettingsSyncTest : public SyncTest { 21 class SingleClientSupervisedUserSettingsSyncTest : public SyncTest {
22 public: 22 public:
23 SingleClientSupervisedUserSettingsSyncTest() : SyncTest(SINGLE_CLIENT) {} 23 SingleClientSupervisedUserSettingsSyncTest() : SyncTest(SINGLE_CLIENT) {}
24 24
25 ~SingleClientSupervisedUserSettingsSyncTest() override {} 25 ~SingleClientSupervisedUserSettingsSyncTest() override {}
26 26
27 // SyncTest overrides: 27 // SyncTest overrides:
28 void SetUpCommandLine(base::CommandLine* command_line) override { 28 void SetUpCommandLine(base::CommandLine* command_line) override {
(...skipping 21 matching lines...) Expand all
50 browser()->profile(), 50 browser()->profile(),
51 GoogleServiceAuthError(GoogleServiceAuthError::NONE), 51 GoogleServiceAuthError(GoogleServiceAuthError::NONE),
52 std::string("token value doesn't matter in tests")); 52 std::string("token value doesn't matter in tests"));
53 53
54 ASSERT_TRUE(GetClient(0)->AwaitBackendInitialization()); 54 ASSERT_TRUE(GetClient(0)->AwaitBackendInitialization());
55 ASSERT_TRUE(GetClient(0)->AwaitSyncSetupCompletion()); 55 ASSERT_TRUE(GetClient(0)->AwaitSyncSetupCompletion());
56 56
57 // TODO(pvalenzuela): Add additional tests and some verification of sync- 57 // TODO(pvalenzuela): Add additional tests and some verification of sync-
58 // specific features (e.g., assert certain datatypes are syncing). 58 // specific features (e.g., assert certain datatypes are syncing).
59 } 59 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698