| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 #include "net/proxy/proxy_config.h" | 46 #include "net/proxy/proxy_config.h" |
| 47 #include "net/proxy/proxy_config_service_fixed.h" | 47 #include "net/proxy/proxy_config_service_fixed.h" |
| 48 #include "net/proxy/proxy_service.h" | 48 #include "net/proxy/proxy_service.h" |
| 49 #include "net/test/test_server.h" | 49 #include "net/test/test_server.h" |
| 50 #include "net/url_request/test_url_fetcher_factory.h" | 50 #include "net/url_request/test_url_fetcher_factory.h" |
| 51 #include "net/url_request/url_fetcher.h" | 51 #include "net/url_request/url_fetcher.h" |
| 52 #include "net/url_request/url_fetcher_delegate.h" | 52 #include "net/url_request/url_fetcher_delegate.h" |
| 53 #include "net/url_request/url_request_context.h" | 53 #include "net/url_request/url_request_context.h" |
| 54 #include "net/url_request/url_request_context_getter.h" | 54 #include "net/url_request/url_request_context_getter.h" |
| 55 #include "net/url_request/url_request_status.h" | 55 #include "net/url_request/url_request_status.h" |
| 56 #include "sync/notifier/p2p_notifier.h" | 56 #include "sync/notifier/p2p_invalidator.h" |
| 57 #include "sync/protocol/sync.pb.h" | 57 #include "sync/protocol/sync.pb.h" |
| 58 #include "sync/engine/sync_scheduler_impl.h" | 58 #include "sync/engine/sync_scheduler_impl.h" |
| 59 | 59 |
| 60 using content::BrowserThread; | 60 using content::BrowserThread; |
| 61 | 61 |
| 62 namespace switches { | 62 namespace switches { |
| 63 const char kPasswordFileForTest[] = "password-file-for-test"; | 63 const char kPasswordFileForTest[] = "password-file-for-test"; |
| 64 const char kSyncUserForTest[] = "sync-user-for-test"; | 64 const char kSyncUserForTest[] = "sync-user-for-test"; |
| 65 const char kSyncPasswordForTest[] = "sync-password-for-test"; | 65 const char kSyncPasswordForTest[] = "sync-password-for-test"; |
| 66 const char kSyncServerCommandLine[] = "sync-server-command-line"; | 66 const char kSyncServerCommandLine[] = "sync-server-command-line"; |
| (...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 | 795 |
| 796 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 796 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
| 797 const net::ProxyConfig& proxy_config) { | 797 const net::ProxyConfig& proxy_config) { |
| 798 base::WaitableEvent done(false, false); | 798 base::WaitableEvent done(false, false); |
| 799 BrowserThread::PostTask( | 799 BrowserThread::PostTask( |
| 800 BrowserThread::IO, FROM_HERE, | 800 BrowserThread::IO, FROM_HERE, |
| 801 base::Bind(&SetProxyConfigCallback, &done, | 801 base::Bind(&SetProxyConfigCallback, &done, |
| 802 make_scoped_refptr(context_getter), proxy_config)); | 802 make_scoped_refptr(context_getter), proxy_config)); |
| 803 done.Wait(); | 803 done.Wait(); |
| 804 } | 804 } |
| OLD | NEW |