| 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 202 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 213 } | 213 } | 
| 214 | 214 | 
| 215 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {} | 215 void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {} | 
| 216 | 216 | 
| 217 // static | 217 // static | 
| 218 Profile* SyncTest::MakeProfile(const base::FilePath::StringType name) { | 218 Profile* SyncTest::MakeProfile(const base::FilePath::StringType name) { | 
| 219   base::FilePath path; | 219   base::FilePath path; | 
| 220   PathService::Get(chrome::DIR_USER_DATA, &path); | 220   PathService::Get(chrome::DIR_USER_DATA, &path); | 
| 221   path = path.Append(name); | 221   path = path.Append(name); | 
| 222 | 222 | 
| 223   if (!file_util::PathExists(path)) | 223   if (!base::PathExists(path)) | 
| 224     CHECK(file_util::CreateDirectory(path)); | 224     CHECK(file_util::CreateDirectory(path)); | 
| 225 | 225 | 
| 226   Profile* profile = | 226   Profile* profile = | 
| 227       Profile::CreateProfile(path, NULL, Profile::CREATE_MODE_SYNCHRONOUS); | 227       Profile::CreateProfile(path, NULL, Profile::CREATE_MODE_SYNCHRONOUS); | 
| 228   g_browser_process->profile_manager()->RegisterTestingProfile(profile, | 228   g_browser_process->profile_manager()->RegisterTestingProfile(profile, | 
| 229                                                                true, | 229                                                                true, | 
| 230                                                                true); | 230                                                                true); | 
| 231   return profile; | 231   return profile; | 
| 232 } | 232 } | 
| 233 | 233 | 
| (...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 825 | 825 | 
| 826 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 826 void SyncTest::SetProxyConfig(net::URLRequestContextGetter* context_getter, | 
| 827                               const net::ProxyConfig& proxy_config) { | 827                               const net::ProxyConfig& proxy_config) { | 
| 828   base::WaitableEvent done(false, false); | 828   base::WaitableEvent done(false, false); | 
| 829   BrowserThread::PostTask( | 829   BrowserThread::PostTask( | 
| 830       BrowserThread::IO, FROM_HERE, | 830       BrowserThread::IO, FROM_HERE, | 
| 831       base::Bind(&SetProxyConfigCallback, &done, | 831       base::Bind(&SetProxyConfigCallback, &done, | 
| 832                  make_scoped_refptr(context_getter), proxy_config)); | 832                  make_scoped_refptr(context_getter), proxy_config)); | 
| 833   done.Wait(); | 833   done.Wait(); | 
| 834 } | 834 } | 
| OLD | NEW | 
|---|