Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3862)

Unified Diff: net/proxy/proxy_config_service_linux_unittest.cc

Issue 2944313003: Remove the dependence on BrowserThread::FILE for (Closed)
Patch Set: address mmenke's comments Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_linux_unittest.cc
diff --git a/net/proxy/proxy_config_service_linux_unittest.cc b/net/proxy/proxy_config_service_linux_unittest.cc
index 622b8f10cd99462092eba46022cd1e0fbb403baf..4251fdc8b7e9decf4a05c5d7b5b660d507b5578c 100644
--- a/net/proxy/proxy_config_service_linux_unittest.cc
+++ b/net/proxy/proxy_config_service_linux_unittest.cc
@@ -194,8 +194,7 @@ class MockSettingGetter : public ProxyConfigServiceLinux::SettingGetter {
values = zero_values;
}
- bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
- const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner)
+ bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner)
override {
task_runner_ = glib_task_runner;
return true;
@@ -208,7 +207,7 @@ class MockSettingGetter : public ProxyConfigServiceLinux::SettingGetter {
return true;
}
- const scoped_refptr<base::SingleThreadTaskRunner>& GetNotificationTaskRunner()
+ const scoped_refptr<base::SequencedTaskRunner>& GetNotificationTaskRunner()
override {
return task_runner_;
}
@@ -261,7 +260,7 @@ class MockSettingGetter : public ProxyConfigServiceLinux::SettingGetter {
GConfValues values;
private:
- scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
+ scoped_refptr<base::SequencedTaskRunner> task_runner_;
SettingsTable<StringSetting, const char*> strings_table;
SettingsTable<BoolSetting, BoolSettingValue> bools_table;
SettingsTable<IntSetting, int> ints_table;
@@ -306,10 +305,8 @@ class SynchConfigGetter : public ProxyConfigService::Observer {
// all on the calling thread (meant to be the thread with the
// default glib main loop, which is the UI thread).
void SetupAndInitialFetch() {
- // We pass the mock IO thread as both the IO and file threads.
config_service_->SetupAndFetchInitialConfig(
- base::ThreadTaskRunnerHandle::Get(), io_thread_.task_runner(),
- io_thread_.task_runner());
+ base::ThreadTaskRunnerHandle::Get(), io_thread_.task_runner());
}
// Synchronously gets the proxy config.
ProxyConfigService::ConfigAvailability SyncGetLatestProxyConfig(
« no previous file with comments | « net/proxy/proxy_config_service_linux.cc ('k') | net/proxy/proxy_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698