summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net/proxy_service_factory.cc
diff options
context:
space:
mode:
authorsatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-17 05:10:30 +0000
committersatorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-17 05:10:30 +0000
commit83aa77e873d1dfde716c0083f6f5704999c93748 (patch)
tree0523199cb0032c5b48e2ca82aa243d1b65ce1fc9 /chrome/browser/net/proxy_service_factory.cc
parentaf3b0898b4adf7961c5af8c6e1ef4909672c8488 (diff)
downloadchromium_src-83aa77e873d1dfde716c0083f6f5704999c93748.zip
chromium_src-83aa77e873d1dfde716c0083f6f5704999c93748.tar.gz
chromium_src-83aa77e873d1dfde716c0083f6f5704999c93748.tar.bz2
Rework LibcrosService using our D-Bus library.
Also introduce DBusThreadManager, that manages the D-Bus thread, and D-Bus clients using the thread. cros_dbus_service.cc and proxy_resolution_service_provider.cc are based on libcros_service_library.cc. The basic logic is kept as before. The major changes are: - Get rid of all libcros function calls (ex. StartLibCrosService). - Export "ResolveProxy" D-Bus method from Chrome, instead of libcros. - CrosDBusService is now managed by DBusThreadManager, instead of CrosLibrary. - Reduce use of nested class per the C++ style guide. - Now unit tested: libcros_service_unittest.cc BUG=chromium-os:18904 TEST=on the device, change the proxy config to use http://proxyconfig.corp.google.com/wpad.dat, run /opt/google/chrome/chromeos/libcros_service_tester (installed by USE=install_tests gmerge libcros), and confirm the libcros service works as before. Review URL: http://codereview.chromium.org/7819012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/net/proxy_service_factory.cc')
-rw-r--r--chrome/browser/net/proxy_service_factory.cc8
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 898596eb..1031dcf 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -19,8 +19,6 @@
#include "net/url_request/url_request_context.h"
#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/libcros_service_library.h"
#include "chrome/browser/chromeos/proxy_config_service.h"
#endif // defined(OS_CHROMEOS)
@@ -105,11 +103,5 @@ net::ProxyService* ProxyServiceFactory::CreateProxyService(
net_log);
}
-#if defined(OS_CHROMEOS)
- if (chromeos::CrosLibrary::Get()->EnsureLoaded()) {
- chromeos::CrosLibrary::Get()->GetLibCrosServiceLibrary()->StartService();
- }
-#endif // defined(OS_CHROMEOS)
-
return proxy_service;
}