ProxyServer commandline flag for android webview

android_webview/browser/net/aw_url_request_context_getter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include <utility>
 #include <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
@@ skipping 41 matching lines @@
 #include "net/url_request/url_request_interceptor.h"
 
 using content::BrowserThread;
 
 namespace android_webview {
 
 
 namespace {
 
 const base::FilePath::CharType kChannelIDFilename[] = "Origin Bound Certs";
+const std::string kProxyServerSwitch = "proxy-server";

[eroman, 2016/09/13 22:34:42]

Write this instead as:

const char kProxyServerSwitch[] = "proxy-server";

(We aren't allowed to define global std::string like this since it adds static
initializers to the binary)

[Nate Fischer, 2016/09/13 22:53:54]

Done. Good to know

 
 void ApplyCmdlineOverridesToHostResolver(
     net::MappedHostResolver* host_resolver) {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kHostResolverRules)) {
     // If hostname remappings were specified on the command-line, layer these
     // rules on top of the real host resolver. This allows forwarding all
     // requests through a designated test server.
     host_resolver->SetRulesFromString(
@@ skipping 149 matching lines @@
             BrowserThread::GetBlockingPool()->GetSequenceToken()));
 
     channel_id_service.reset(new net::ChannelIDService(
         new net::DefaultChannelIDStore(channel_id_db.get()),
         base::WorkerPool::GetTaskRunner(true)));
   }
 
   // Android provides a local HTTP proxy that handles all the proxying.
   // Create the proxy without a resolver since we rely on this local HTTP proxy.
   // TODO(sgurun) is this behavior guaranteed through SDK?
-  builder.set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(
-      std::move(proxy_config_service_), net_log_.get()));
+
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(kProxyServerSwitch)) {
+    std::string proxy = command_line.GetSwitchValueASCII(kProxyServerSwitch);
+    builder.set_proxy_service(net::ProxyService::CreateFixed(proxy));
+  } else {
+    builder.set_proxy_service(net::ProxyService::CreateWithoutProxyResolver(
+        std::move(proxy_config_service_), net_log_.get()));
+  }
   builder.set_net_log(net_log_.get());
   builder.SetCookieAndChannelIdStores(base::MakeUnique<AwCookieStoreWrapper>(),
                                       std::move(channel_id_service));
 
   net::URLRequestContextBuilder::HttpCacheParams cache_params;
   cache_params.type =
       net::URLRequestContextBuilder::HttpCacheParams::DISK_SIMPLE;
   cache_params.max_size = 20 * 1024 * 1024;  // 20M
   cache_params.path = cache_path_;
   builder.EnableHttpCache(cache_params);
@@ skipping 69 matching lines @@
   http_auth_preferences_->set_server_whitelist(
       auth_server_whitelist_.GetValue());
 }
 
 void AwURLRequestContextGetter::UpdateAndroidAuthNegotiateAccountType() {
   http_auth_preferences_->set_auth_android_negotiate_account_type(
       auth_android_negotiate_account_type_.GetValue());
 }
 
 }  // namespace android_webview