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

Unified Diff: chrome_proxy_resolver.h

Issue 5205002: AU: Manual proxy support (Closed) Base URL: http://git.chromium.org/git/update_engine.git@master
Patch Set: missed one fix for review Created 10 years, 1 month 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 | « SConstruct ('k') | chrome_proxy_resolver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_proxy_resolver.h
diff --git a/chrome_proxy_resolver.h b/chrome_proxy_resolver.h
index 796f8fbd15aa9b8ec34f96191e7416bf5428e17c..28d96cdc02a4986927958bae5be30731e38ae251 100644
--- a/chrome_proxy_resolver.h
+++ b/chrome_proxy_resolver.h
@@ -5,8 +5,8 @@
#ifndef CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__
#define CHROMEOS_PLATFORM_UPDATE_ENGINE_CHROME_PROXY_RESOLVER_H__
+#include <deque>
#include <string>
-#include <vector>
#include <curl/curl.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
@@ -33,12 +33,11 @@ class ChromeProxyResolver : public ProxyResolver {
virtual ~ChromeProxyResolver() {}
virtual bool GetProxiesForUrl(const std::string& url,
- std::vector<std::string>* out_proxies);
+ std::deque<std::string>* out_proxies);
// Get the curl proxy type for a given proxy url. Returns true on success.
// Note: if proxy is kNoProxy, this will return false.
- static bool GetProxyType(const std::string& proxy,
- curl_proxytype* out_type);
+ static bool GetProxyType(const std::string& proxy, curl_proxytype* out_type);
private:
FRIEND_TEST(ChromeProxyResolverTest, GetProxiesForUrlWithSettingsTest);
@@ -54,7 +53,7 @@ class ChromeProxyResolver : public ProxyResolver {
// success.
bool GetProxiesForUrlWithSettings(const std::string& url,
const std::string& json_settings,
- std::vector<std::string>* out_proxies);
+ std::deque<std::string>* out_proxies);
DbusGlibInterface* dbus_;
« no previous file with comments | « SConstruct ('k') | chrome_proxy_resolver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698