| 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 20 matching lines...) Expand all Loading... |
| 31 #include "chrome/browser/ui/browser.h" | 31 #include "chrome/browser/ui/browser.h" |
| 32 #include "chrome/browser/ui/browser_list.h" | 32 #include "chrome/browser/ui/browser_list.h" |
| 33 #include "chrome/common/chrome_paths.h" | 33 #include "chrome/common/chrome_paths.h" |
| 34 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 35 #include "chrome/common/net/gaia/gaia_urls.h" | 35 #include "chrome/common/net/gaia/gaia_urls.h" |
| 36 #include "chrome/test/base/testing_browser_process.h" | 36 #include "chrome/test/base/testing_browser_process.h" |
| 37 #include "chrome/test/base/ui_test_utils.h" | 37 #include "chrome/test/base/ui_test_utils.h" |
| 38 #include "content/public/browser/web_contents.h" | 38 #include "content/public/browser/web_contents.h" |
| 39 #include "content/public/common/url_fetcher.h" | 39 #include "content/public/common/url_fetcher.h" |
| 40 #include "content/public/test/test_browser_thread.h" | 40 #include "content/public/test/test_browser_thread.h" |
| 41 #include "content/test/test_url_fetcher_factory.h" | 41 #include "content/public/test/test_url_fetcher_factory.h" |
| 42 #include "googleurl/src/gurl.h" | 42 #include "googleurl/src/gurl.h" |
| 43 #include "net/base/escape.h" | 43 #include "net/base/escape.h" |
| 44 #include "net/base/load_flags.h" | 44 #include "net/base/load_flags.h" |
| 45 #include "net/base/network_change_notifier.h" | 45 #include "net/base/network_change_notifier.h" |
| 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/url_fetcher_delegate.h" | 50 #include "net/url_request/url_fetcher_delegate.h" |
| 51 #include "net/url_request/url_request_context.h" | 51 #include "net/url_request/url_request_context.h" |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 772 | 772 |
| 773 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 773 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
| 774 const net::ProxyConfig& proxy_config) { | 774 const net::ProxyConfig& proxy_config) { |
| 775 base::WaitableEvent done(false, false); | 775 base::WaitableEvent done(false, false); |
| 776 BrowserThread::PostTask( | 776 BrowserThread::PostTask( |
| 777 BrowserThread::IO, FROM_HERE, | 777 BrowserThread::IO, FROM_HERE, |
| 778 base::Bind(&SetProxyConfigCallback, &done, | 778 base::Bind(&SetProxyConfigCallback, &done, |
| 779 make_scoped_refptr(context_getter), proxy_config)); | 779 make_scoped_refptr(context_getter), proxy_config)); |
| 780 done.Wait(); | 780 done.Wait(); |
| 781 } | 781 } |
| OLD | NEW |