diff options
| author | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 14:37:39 +0000 |
|---|---|---|
| committer | sdoyon@chromium.org <sdoyon@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 14:37:39 +0000 |
| commit | 3e44697f8e0749d2acd1d3ee1431a27df2c94e74 (patch) | |
| tree | 9c47adff10faf24a44a0c85193592b1ac2bdd433 /webkit | |
| parent | 069b2bcaa3e12a0063acae3cdcf2beb16c1077c1 (diff) | |
| download | chromium_src-3e44697f8e0749d2acd1d3ee1431a27df2c94e74.zip chromium_src-3e44697f8e0749d2acd1d3ee1431a27df2c94e74.tar.gz chromium_src-3e44697f8e0749d2acd1d3ee1431a27df2c94e74.tar.bz2 | |
Fix gconf for the linux proxy config service.
-Reenables fetching of settings from gconf.
-Moves all gconf access to happen from the UI thread only, (where
the default glib main loop runs).
-Adds support for gconf notifications, avoiding having to poll the settings.
-Fixes a small initialization glitch in the unittest. Plus minor code style tweaks.
-Permanently removes gdk and glib threading initialization calls that
were previously disabled.
-Slight reorganization of ProxyService creation to pass down the IO
thread MessageLoop.
BUG=11111
TEST=none
Review URL: http://codereview.chromium.org/113043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/test_shell/run_all_tests.cc | 2 | ||||
| -rw-r--r-- | webkit/tools/test_shell/test_shell_request_context.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc index 2b69707..7391ff5 100644 --- a/webkit/tools/test_shell/run_all_tests.cc +++ b/webkit/tools/test_shell/run_all_tests.cc @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) { // Allocate a message loop for this thread. Although it is not used // directly, its constructor sets up some necessary state. - MessageLoop main_message_loop; + MessageLoopForUI main_message_loop; // Load ICU data tables icu_util::Initialize(); diff --git a/webkit/tools/test_shell/test_shell_request_context.cc b/webkit/tools/test_shell/test_shell_request_context.cc index 6a58104..f0979f0 100644 --- a/webkit/tools/test_shell/test_shell_request_context.cc +++ b/webkit/tools/test_shell/test_shell_request_context.cc @@ -30,7 +30,8 @@ void TestShellRequestContext::Init( accept_charset_ = "iso-8859-1,*,utf-8"; net::ProxyConfig proxy_config; - proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL); + proxy_service_ = net::ProxyService::Create(no_proxy ? &proxy_config : NULL, + false, NULL, NULL); net::HttpCache *cache; if (cache_path.empty()) { |