diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/in_process_browser_test.cc | 4 | ||||
-rw-r--r-- | chrome/test/reliability/page_load_test.cc | 2 | ||||
-rw-r--r-- | chrome/test/testing_profile.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index d4028db..4b5f205 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -14,6 +14,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/browser_shutdown.h" #include "chrome/browser/browser_window.h" +#include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/url_request_mock_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/profile_manager.h" @@ -220,7 +221,8 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() { #endif CHECK(PathService::Override(base::FILE_EXE, chrome_path)); - g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, + ChromeThread::PostTask( + ChromeThread::IO, FROM_HERE, NewRunnableFunction(chrome_browser_net::SetUrlRequestMocksEnabled, true)); browser_ = CreateBrowser(profile); diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 4df7423..ffaa63a 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -539,7 +539,7 @@ class PageLoadTest : public UITest { FilePath local_state_path = user_data_dir() .Append(chrome::kLocalStateFilename); - PrefService* local_state(new PrefService(local_state_path, NULL)); + PrefService* local_state(new PrefService(local_state_path)); return local_state; } diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index adbb7dd4..61083af 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -114,7 +114,7 @@ class TestingProfile : public Profile { if (!prefs_.get()) { FilePath prefs_filename = path_.Append(FILE_PATH_LITERAL("TestPreferences")); - prefs_.reset(new PrefService(prefs_filename, NULL)); + prefs_.reset(new PrefService(prefs_filename)); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); } |