summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 22:13:17 +0000
committermdm@chromium.org <mdm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-02 22:13:17 +0000
commit051e71e1b702970eb39302abbe29836239036a3d (patch)
tree924fea815362c019217ff9058961a80db6c49cee
parent70b3e7d594425427ee8daac76db9eb48edc688ec (diff)
downloadchromium_src-051e71e1b702970eb39302abbe29836239036a3d.zip
chromium_src-051e71e1b702970eb39302abbe29836239036a3d.tar.gz
chromium_src-051e71e1b702970eb39302abbe29836239036a3d.tar.bz2
Linux: avoid using a NULL MessageLoopForIO to get its MessageLoopProxy in ProxySettingGetterImplKDE.
BUG=130761 Review URL: https://chromiumcodereview.appspot.com/10497002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140204 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/proxy/proxy_config_service_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index 732ac59..5012d5f 100644
--- a/net/proxy/proxy_config_service_linux.cc
+++ b/net/proxy/proxy_config_service_linux.cc
@@ -1032,7 +1032,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter,
}
virtual base::SingleThreadTaskRunner* GetNotificationTaskRunner() OVERRIDE {
- return file_loop_->message_loop_proxy();
+ return file_loop_ ? file_loop_->message_loop_proxy() : NULL;
}
// Implement base::MessagePumpLibevent::Watcher.