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

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

Issue 1408003010: [sync] Componentize switches used by ProfileSyncService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@more_pss_chrome_deps
Patch Set: Rebase Created 5 years, 1 month 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/callback.h" 6 #include "base/callback.h"
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 13 matching lines...) Expand all
24 #include "chrome/browser/sync/glue/sync_backend_host_mock.h" 24 #include "chrome/browser/sync/glue/sync_backend_host_mock.h"
25 #include "chrome/browser/sync/profile_sync_service.h" 25 #include "chrome/browser/sync/profile_sync_service.h"
26 #include "chrome/browser/sync/profile_sync_test_util.h" 26 #include "chrome/browser/sync/profile_sync_test_util.h"
27 #include "chrome/common/channel_info.h" 27 #include "chrome/common/channel_info.h"
28 #include "chrome/common/chrome_switches.h" 28 #include "chrome/common/chrome_switches.h"
29 #include "chrome/common/pref_names.h" 29 #include "chrome/common/pref_names.h"
30 #include "chrome/grit/generated_resources.h" 30 #include "chrome/grit/generated_resources.h"
31 #include "chrome/test/base/testing_browser_process.h" 31 #include "chrome/test/base/testing_browser_process.h"
32 #include "chrome/test/base/testing_profile.h" 32 #include "chrome/test/base/testing_profile.h"
33 #include "chrome/test/base/testing_profile_manager.h" 33 #include "chrome/test/base/testing_profile_manager.h"
34 #include "components/browser_sync/common/browser_sync_switches.h"
34 #include "components/invalidation/impl/profile_invalidation_provider.h" 35 #include "components/invalidation/impl/profile_invalidation_provider.h"
35 #include "components/invalidation/public/invalidation_service.h" 36 #include "components/invalidation/public/invalidation_service.h"
36 #include "components/signin/core/browser/account_tracker_service.h" 37 #include "components/signin/core/browser/account_tracker_service.h"
37 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 38 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
38 #include "components/signin/core/browser/signin_manager.h" 39 #include "components/signin/core/browser/signin_manager.h"
39 #include "components/signin/core/browser/signin_manager.h" 40 #include "components/signin/core/browser/signin_manager.h"
40 #include "components/sync_driver/data_type_manager.h" 41 #include "components/sync_driver/data_type_manager.h"
41 #include "components/sync_driver/data_type_manager_observer.h" 42 #include "components/sync_driver/data_type_manager_observer.h"
42 #include "components/sync_driver/fake_data_type_controller.h" 43 #include "components/sync_driver/fake_data_type_controller.h"
43 #include "components/sync_driver/pref_names.h" 44 #include "components/sync_driver/pref_names.h"
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after
1054 InitializeForNthSync(); 1055 InitializeForNthSync();
1055 1056
1056 syncer::SyncProtocolError client_cmd; 1057 syncer::SyncProtocolError client_cmd;
1057 client_cmd.action = syncer::RESET_LOCAL_SYNC_DATA; 1058 client_cmd.action = syncer::RESET_LOCAL_SYNC_DATA;
1058 service()->OnActionableError(client_cmd); 1059 service()->OnActionableError(client_cmd);
1059 EXPECT_EQ(ProfileSyncService::SYNC, service()->backend_mode()); 1060 EXPECT_EQ(ProfileSyncService::SYNC, service()->backend_mode());
1060 } 1061 }
1061 1062
1062 } // namespace 1063 } // namespace
1063 } // namespace browser_sync 1064 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698