OLD | NEW |
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 "chrome/browser/sync/test/integration/sync_test.h" | 5 #include "chrome/browser/sync/test/integration/sync_test.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 23 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
24 #include "chrome/browser/history/history_service_factory.h" | 24 #include "chrome/browser/history/history_service_factory.h" |
25 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" | 25 #include "chrome/browser/invalidation/profile_invalidation_provider_factory.h" |
26 #include "chrome/browser/lifetime/application_lifetime.h" | 26 #include "chrome/browser/lifetime/application_lifetime.h" |
27 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
28 #include "chrome/browser/profiles/profile_manager.h" | 28 #include "chrome/browser/profiles/profile_manager.h" |
29 #include "chrome/browser/search_engines/template_url_service_factory.h" | 29 #include "chrome/browser/search_engines/template_url_service_factory.h" |
30 #include "chrome/browser/signin/profile_identity_provider.h" | 30 #include "chrome/browser/signin/profile_identity_provider.h" |
31 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" | 31 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
32 #include "chrome/browser/signin/signin_manager_factory.h" | 32 #include "chrome/browser/signin/signin_manager_factory.h" |
| 33 #include "chrome/browser/sync/glue/invalidation_helper.h" |
33 #include "chrome/browser/sync/profile_sync_service.h" | 34 #include "chrome/browser/sync/profile_sync_service.h" |
34 #include "chrome/browser/sync/profile_sync_service_factory.h" | 35 #include "chrome/browser/sync/profile_sync_service_factory.h" |
35 #include "chrome/browser/sync/test/integration/fake_server_invalidation_service.
h" | 36 #include "chrome/browser/sync/test/integration/fake_server_invalidation_service.
h" |
36 #include "chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h" | 37 #include "chrome/browser/sync/test/integration/p2p_invalidation_forwarder.h" |
37 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 38 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
38 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" | 39 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" |
39 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 40 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
40 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 41 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
41 #include "chrome/browser/ui/browser.h" | 42 #include "chrome/browser/ui/browser.h" |
42 #include "chrome/browser/ui/browser_finder.h" | 43 #include "chrome/browser/ui/browser_finder.h" |
(...skipping 1008 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1051 BrowserThread::PostTask( | 1052 BrowserThread::PostTask( |
1052 BrowserThread::IO, FROM_HERE, | 1053 BrowserThread::IO, FROM_HERE, |
1053 base::Bind(&SetProxyConfigCallback, &done, | 1054 base::Bind(&SetProxyConfigCallback, &done, |
1054 make_scoped_refptr(context_getter), proxy_config)); | 1055 make_scoped_refptr(context_getter), proxy_config)); |
1055 done.Wait(); | 1056 done.Wait(); |
1056 } | 1057 } |
1057 | 1058 |
1058 fake_server::FakeServer* SyncTest::GetFakeServer() const { | 1059 fake_server::FakeServer* SyncTest::GetFakeServer() const { |
1059 return fake_server_.get(); | 1060 return fake_server_.get(); |
1060 } | 1061 } |
OLD | NEW |