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

Side by Side Diff: chrome/browser/sync/test_profile_sync_service.h

Issue 278053002: Move DataTypeManager into sync_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix tests Created 6 years, 7 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_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_ 5 #ifndef CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
6 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_ 6 #define CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
11 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "chrome/browser/sync/glue/data_type_manager_impl.h"
14 #include "chrome/browser/sync/glue/sync_backend_host_impl.h" 13 #include "chrome/browser/sync/glue/sync_backend_host_impl.h"
15 #include "chrome/browser/sync/profile_sync_service.h" 14 #include "chrome/browser/sync/profile_sync_service.h"
16 #include "components/signin/core/browser/profile_oauth2_token_service.h" 15 #include "components/signin/core/browser/profile_oauth2_token_service.h"
16 #include "components/sync_driver/data_type_manager_impl.h"
17 #include "components/sync_driver/sync_prefs.h" 17 #include "components/sync_driver/sync_prefs.h"
18 #include "sync/test/engine/test_id_factory.h" 18 #include "sync/test/engine/test_id_factory.h"
19 #include "testing/gmock/include/gmock/gmock.h" 19 #include "testing/gmock/include/gmock/gmock.h"
20 20
21 class Profile; 21 class Profile;
22 class ProfileOAuth2TokenService; 22 class ProfileOAuth2TokenService;
23 class ProfileSyncComponentsFactory; 23 class ProfileSyncComponentsFactory;
24 class ProfileSyncComponentsFactoryMock; 24 class ProfileSyncComponentsFactoryMock;
25 25
26 ACTION(ReturnNewDataTypeManager) { 26 ACTION(ReturnNewDataTypeManager) {
27 return new browser_sync::DataTypeManagerImpl(arg0, 27 return new browser_sync::DataTypeManagerImpl(base::Closure(),
28 arg0,
28 arg1, 29 arg1,
29 arg2, 30 arg2,
30 arg3, 31 arg3,
31 arg4, 32 arg4,
32 arg5); 33 arg5);
33 } 34 }
34 35
35 namespace browser_sync { 36 namespace browser_sync {
36 37
37 class SyncBackendHostForProfileSyncTest : public SyncBackendHostImpl { 38 class SyncBackendHostForProfileSyncTest : public SyncBackendHostImpl {
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 // js messages on UI loop when it's being destroyed, which are not deleted 103 // js messages on UI loop when it's being destroyed, which are not deleted
103 // and cause memory leak in test. 104 // and cause memory leak in test.
104 virtual syncer::WeakHandle<syncer::JsEventHandler> GetJsEventHandler() 105 virtual syncer::WeakHandle<syncer::JsEventHandler> GetJsEventHandler()
105 OVERRIDE; 106 OVERRIDE;
106 107
107 private: 108 private:
108 syncer::TestIdFactory id_factory_; 109 syncer::TestIdFactory id_factory_;
109 }; 110 };
110 111
111 #endif // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_ 112 #endif // CHROME_BROWSER_SYNC_TEST_PROFILE_SYNC_SERVICE_H_
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698