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/message_loop.h" | 12 #include "base/message_loop/message_loop.h" |
13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
| 14 #include "base/process/launch.h" |
14 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
15 #include "base/strings/stringprintf.h" | 16 #include "base/strings/stringprintf.h" |
16 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" |
17 #include "base/synchronization/waitable_event.h" | 18 #include "base/synchronization/waitable_event.h" |
18 #include "base/test/test_timeouts.h" | 19 #include "base/test/test_timeouts.h" |
19 #include "base/threading/platform_thread.h" | 20 #include "base/threading/platform_thread.h" |
20 #include "base/values.h" | 21 #include "base/values.h" |
21 #include "chrome/browser/bookmarks/bookmark_model_factory.h" | 22 #include "chrome/browser/bookmarks/bookmark_model_factory.h" |
22 #include "chrome/browser/google/google_url_tracker.h" | 23 #include "chrome/browser/google/google_url_tracker.h" |
23 #include "chrome/browser/history/history_service_factory.h" | 24 #include "chrome/browser/history/history_service_factory.h" |
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
827 | 828 |
828 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 829 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
829 const net::ProxyConfig& proxy_config) { | 830 const net::ProxyConfig& proxy_config) { |
830 base::WaitableEvent done(false, false); | 831 base::WaitableEvent done(false, false); |
831 BrowserThread::PostTask( | 832 BrowserThread::PostTask( |
832 BrowserThread::IO, FROM_HERE, | 833 BrowserThread::IO, FROM_HERE, |
833 base::Bind(&SetProxyConfigCallback, &done, | 834 base::Bind(&SetProxyConfigCallback, &done, |
834 make_scoped_refptr(context_getter), proxy_config)); | 835 make_scoped_refptr(context_getter), proxy_config)); |
835 done.Wait(); | 836 done.Wait(); |
836 } | 837 } |
OLD | NEW |