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 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
221 | 221 |
222 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {} | 222 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {} |
223 | 223 |
224 // static | 224 // static |
225 Profile* SyncTest::MakeProfile(const base::FilePath::StringType name) { | 225 Profile* SyncTest::MakeProfile(const base::FilePath::StringType name) { |
226 base::FilePath path; | 226 base::FilePath path; |
227 PathService::Get(chrome::DIR_USER_DATA, &path); | 227 PathService::Get(chrome::DIR_USER_DATA, &path); |
228 path = path.Append(name); | 228 path = path.Append(name); |
229 | 229 |
230 if (!base::PathExists(path)) | 230 if (!base::PathExists(path)) |
231 CHECK(file_util::CreateDirectory(path)); | 231 CHECK(base::CreateDirectory(path)); |
232 | 232 |
233 Profile* profile = | 233 Profile* profile = |
234 Profile::CreateProfile(path, NULL, Profile::CREATE_MODE_SYNCHRONOUS); | 234 Profile::CreateProfile(path, NULL, Profile::CREATE_MODE_SYNCHRONOUS); |
235 g_browser_process->profile_manager()->RegisterTestingProfile(profile, | 235 g_browser_process->profile_manager()->RegisterTestingProfile(profile, |
236 true, | 236 true, |
237 true); | 237 true); |
238 return profile; | 238 return profile; |
239 } | 239 } |
240 | 240 |
241 Profile* SyncTest::GetProfile(int index) { | 241 Profile* SyncTest::GetProfile(int index) { |
(...skipping 606 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
848 | 848 |
849 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 849 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, |
850 const net::ProxyConfig& proxy_config) { | 850 const net::ProxyConfig& proxy_config) { |
851 base::WaitableEvent done(false, false); | 851 base::WaitableEvent done(false, false); |
852 BrowserThread::PostTask( | 852 BrowserThread::PostTask( |
853 BrowserThread::IO, FROM_HERE, | 853 BrowserThread::IO, FROM_HERE, |
854 base::Bind(&SetProxyConfigCallback, &done, | 854 base::Bind(&SetProxyConfigCallback, &done, |
855 make_scoped_refptr(context_getter), proxy_config)); | 855 make_scoped_refptr(context_getter), proxy_config)); |
856 done.Wait(); | 856 done.Wait(); |
857 } | 857 } |
OLD | NEW |