commit 4fec0f26e790dc63afcd5adfbc192233eb1bb0cb
author Amin Hassani <ahassani@chromium.org> Mon Nov 09 16:38:14 2020 -0800
committer Commit Bot <commit-bot@chromium.org> Wed Nov 11 04:34:32 2020 +0000
tree 50ced95719ade1683eeed6845f10c82dc3121569
parent 4c5413d0cae0c29c00257000b856890e59bab412

update_engine: Turn on Chrome network proxy by default

This flag is always true in Chorme OS and android's code doesn't compile
this. So it can be removed.

BUG=b:171829801
TEST=cros_workon_make --board reef --test

Change-Id: I1e28955ba8fcd7ca395e538275ba68a2997bcc31
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/2528757
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Jae Hoon Kim <kimjae@chromium.org>
Commit-Queue: Amin Hassani <ahassani@chromium.org>

Android.bp

diff --git a/Android.bp b/Android.bp
index 9cf7bd4..41eaa55 100644
--- a/Android.bp
+++ b/Android.bp
@@ -29,7 +29,6 @@
 
     cflags: [
         "-DBASE_VER=576279",
-        "-DUSE_CHROME_NETWORK_PROXY=0",
         "-DUSE_CHROME_KIOSK_APP=0",
         "-DUSE_HWID_OVERRIDE=0",
         "-D_FILE_OFFSET_BITS=64",

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 90913cb..c5430f9 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -82,7 +82,6 @@
     "USE_FEC=0",
     "USE_HWID_OVERRIDE=${use.hwid_override}",
     "USE_CHROME_KIOSK_APP=${use.chrome_kiosk_app}",
-    "USE_CHROME_NETWORK_PROXY=${use.chrome_network_proxy}",
     "USE_SHILL=1",
   ]
   include_dirs = [

cros/update_attempter.h

diff --git a/cros/update_attempter.h b/cros/update_attempter.h
index a201acf..24c6f54 100644
--- a/cros/update_attempter.h
+++ b/cros/update_attempter.h
@@ -40,9 +40,7 @@
 #include "update_engine/common/proxy_resolver.h"
 #include "update_engine/common/service_observer_interface.h"
 #include "update_engine/common/system_state.h"
-#if USE_CHROME_NETWORK_PROXY
 #include "update_engine/cros/chrome_browser_proxy_resolver.h"
-#endif  // USE_CHROME_NETWORK_PROXY
 #include "update_engine/cros/omaha_request_builder_xml.h"
 #include "update_engine/cros/omaha_request_params.h"
 #include "update_engine/cros/omaha_response_handler_action.h"
@@ -341,10 +339,8 @@
   void MarkDeltaUpdateFailure();
 
   ProxyResolver* GetProxyResolver() {
-#if USE_CHROME_NETWORK_PROXY
     if (obeying_proxies_)
       return &chrome_proxy_resolver_;
-#endif  // USE_CHROME_NETWORK_PROXY
     return &direct_proxy_resolver_;
   }
 
@@ -460,9 +456,7 @@
 
   // Our two proxy resolvers
   DirectProxyResolver direct_proxy_resolver_;
-#if USE_CHROME_NETWORK_PROXY
   ChromeBrowserProxyResolver chrome_proxy_resolver_;
-#endif  // USE_CHROME_NETWORK_PROXY
 
   std::unique_ptr<ActionProcessor> processor_;