| 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" |
| 11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
| 12 #include "base/message_loop.h" | 12 #include "base/message_loop.h" |
| 13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
| 14 #include "base/string_util.h" | 14 #include "base/string_util.h" |
| 15 #include "base/stringprintf.h" | 15 #include "base/stringprintf.h" |
| 16 #include "base/synchronization/waitable_event.h" | 16 #include "base/synchronization/waitable_event.h" |
| 17 #include "base/test/test_timeouts.h" | 17 #include "base/test/test_timeouts.h" |
| 18 #include "base/threading/platform_thread.h" | 18 #include "base/threading/platform_thread.h" |
| 19 #include "base/utf_string_conversions.h" | 19 #include "base/utf_string_conversions.h" |
| 20 #include "base/values.h" | 20 #include "base/values.h" |
| 21 #include "chrome/browser/password_manager/encryptor.h" | 21 #include "chrome/browser/password_manager/encryptor.h" |
| 22 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
| 23 #include "chrome/browser/profiles/profile_manager.h" | 23 #include "chrome/browser/profiles/profile_manager.h" |
| 24 #include "chrome/browser/search_engines/template_url_service.h" | 24 #include "chrome/browser/search_engines/template_url_service.h" |
| 25 #include "chrome/browser/search_engines/template_url_service_factory.h" | 25 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 26 #include "chrome/browser/sync/notifier/p2p_notifier.h" | 26 #include "chrome/browser/sync/notifier/p2p_notifier.h" |
| 27 #include "chrome/browser/sync/profile_sync_service_factory.h" | 27 #include "chrome/browser/sync/profile_sync_service_factory.h" |
| 28 #include "chrome/browser/sync/profile_sync_service_harness.h" | 28 #include "chrome/browser/sync/profile_sync_service_harness.h" |
| 29 #include "chrome/browser/sync/protocol/sync.pb.h" | |
| 30 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 29 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 31 #include "chrome/browser/ui/browser.h" | 30 #include "chrome/browser/ui/browser.h" |
| 32 #include "chrome/browser/ui/browser_list.h" | 31 #include "chrome/browser/ui/browser_list.h" |
| 33 #include "chrome/common/chrome_paths.h" | 32 #include "chrome/common/chrome_paths.h" |
| 34 #include "chrome/common/chrome_switches.h" | 33 #include "chrome/common/chrome_switches.h" |
| 35 #include "chrome/common/net/gaia/gaia_urls.h" | 34 #include "chrome/common/net/gaia/gaia_urls.h" |
| 36 #include "chrome/test/base/testing_browser_process.h" | 35 #include "chrome/test/base/testing_browser_process.h" |
| 37 #include "chrome/test/base/ui_test_utils.h" | 36 #include "chrome/test/base/ui_test_utils.h" |
| 38 #include "content/public/browser/web_contents.h" | 37 #include "content/public/browser/web_contents.h" |
| 39 #include "content/public/common/url_fetcher.h" | 38 #include "content/public/common/url_fetcher.h" |
| 40 #include "content/public/common/url_fetcher_delegate.h" | 39 #include "content/public/common/url_fetcher_delegate.h" |
| 41 #include "content/test/test_browser_thread.h" | 40 #include "content/test/test_browser_thread.h" |
| 42 #include "content/test/test_url_fetcher_factory.h" | 41 #include "content/test/test_url_fetcher_factory.h" |
| 43 #include "googleurl/src/gurl.h" | 42 #include "googleurl/src/gurl.h" |
| 44 #include "net/base/escape.h" | 43 #include "net/base/escape.h" |
| 45 #include "net/base/network_change_notifier.h" | 44 #include "net/base/network_change_notifier.h" |
| 46 #include "net/proxy/proxy_config.h" | 45 #include "net/proxy/proxy_config.h" |
| 47 #include "net/proxy/proxy_config_service_fixed.h" | 46 #include "net/proxy/proxy_config_service_fixed.h" |
| 48 #include "net/proxy/proxy_service.h" | 47 #include "net/proxy/proxy_service.h" |
| 49 #include "net/test/test_server.h" | 48 #include "net/test/test_server.h" |
| 50 #include "net/url_request/url_request_context.h" | 49 #include "net/url_request/url_request_context.h" |
| 51 #include "net/url_request/url_request_context_getter.h" | 50 #include "net/url_request/url_request_context_getter.h" |
| 52 #include "net/url_request/url_request_status.h" | 51 #include "net/url_request/url_request_status.h" |
| 52 #include "sync/protocol/sync.pb.h" |
| 53 | 53 |
| 54 using content::BrowserThread; | 54 using content::BrowserThread; |
| 55 | 55 |
| 56 namespace switches { | 56 namespace switches { |
| 57 const char kPasswordFileForTest[] = "password-file-for-test"; | 57 const char kPasswordFileForTest[] = "password-file-for-test"; |
| 58 const char kSyncUserForTest[] = "sync-user-for-test"; | 58 const char kSyncUserForTest[] = "sync-user-for-test"; |
| 59 const char kSyncPasswordForTest[] = "sync-password-for-test"; | 59 const char kSyncPasswordForTest[] = "sync-password-for-test"; |
| 60 const char kSyncServerCommandLine[] = "sync-server-command-line"; | 60 const char kSyncServerCommandLine[] = "sync-server-command-line"; |
| 61 } | 61 } |
| 62 | 62 |
| (...skipping 696 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 759 | 759 |
| 760 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 760 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
| 761 const net::ProxyConfig& proxy_config) { | 761 const net::ProxyConfig& proxy_config) { |
| 762 base::WaitableEvent done(false, false); | 762 base::WaitableEvent done(false, false); |
| 763 BrowserThread::PostTask( | 763 BrowserThread::PostTask( |
| 764 BrowserThread::IO, FROM_HERE, | 764 BrowserThread::IO, FROM_HERE, |
| 765 base::Bind(&SetProxyConfigCallback, &done, | 765 base::Bind(&SetProxyConfigCallback, &done, |
| 766 make_scoped_refptr(context_getter), proxy_config)); | 766 make_scoped_refptr(context_getter), proxy_config)); |
| 767 done.Wait(); | 767 done.Wait(); |
| 768 } | 768 } |
| OLD | NEW |