Revert "Refactor update_client deps."

This reverts commit 46935a5d.

Reason for revert: Flakily exposes unsatisfied include in chrome/updater.

Original change's description:
> Refactor update_client deps.
> 
> This reduces the build artifacts necessary to build chrome/updater from
> 5k to 1.7k.
> 
> Change-Id: I7332c69a5f564a08786d7e21e5891448feca8f11
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1557988
> Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
> Reviewed-by: Sorin Jianu <sorin@chromium.org>
> Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
> Reviewed-by: Nico Weber <thakis@chromium.org>
> Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
> Auto-Submit: Joshua Pawlicki <waffles@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#649098}

TBR=thakis@chromium.org,rdevlin.cronin@chromium.org,sdefresne@chromium.org,sorin@chromium.org,waffles@chromium.org

Change-Id: I87ae2b63eb8ae604dc038b4f14e9b9ada5459cc6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1559871Reviewed-by: Joshua Pawlicki <waffles@chromium.org>
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Cr-Commit-Position: refs/heads/master@{#649117}

chrome/browser/BUILD.gn

@@ -1970,7 +1970,8 @@ jumbo_split_static_library("browser") {
     "//components/undo",
     "//components/unified_consent",
     "//components/update_client",
-    "//components/update_client:common_impl",
+    "//components/update_client:patch_impl",
+    "//components/update_client:unzip_impl",
     "//components/upload_list",
     "//components/url_formatter",
     "//components/url_formatter/top_domains:top500_domains",

chrome/browser/extensions/BUILD.gn

@@ -854,7 +854,8 @@ jumbo_static_library("extensions") {
     "//components/undo",
     "//components/unified_consent",
     "//components/update_client",
-    "//components/update_client:common_impl",
+    "//components/update_client:patch_impl",
+    "//components/update_client:unzip_impl",
     "//components/url_matcher",
     "//components/user_prefs",
     "//components/vector_icons",

components/update_client/BUILD.gn

@@ -4,15 +4,26 @@
 
 import("//net/features.gni")
 
-source_set("network_impl") {
+source_set("network_public") {
   sources = [
     "net/network_chromium.h",
+  ]
+
+  deps = [
+    "//base",
+  ]
+}
+
+source_set("network") {
+  sources = [
     "net/network_impl.cc",
     "net/network_impl.h",
   ]
 
+  visibility = [ ":*" ]
+
   deps = [
-    ":update_client",
+    ":network_public",
     "//base",
     "//net",
     "//services/network/public/cpp:cpp",
@@ -42,14 +53,6 @@ source_set("patch_impl") {
   ]
 }
 
-group("common_impl") {
-  public_deps = [
-    ":network_impl",
-    ":patch_impl",
-    ":unzip_impl",
-  ]
-}
-
 static_library("update_client") {
   sources = [
     "action_runner.cc",
@@ -122,16 +125,29 @@ static_library("update_client") {
     "utils.h",
   ]
 
+  # Allows callers to include the network factory through "update_client" deps.
+  public_deps = [
+    ":network_public",
+  ]
+
   deps = [
+    ":network",
+    ":network_public",
     "//base",
     "//components/client_update_protocol",
     "//components/crx_file",
+    "//components/data_use_measurement/core",
     "//components/prefs",
     "//components/version_info:version_info",
     "//courgette:courgette_lib",
     "//crypto",
     "//url",
   ]
+
+  allow_circular_includes_from = [
+    ":network",
+    ":network_public",
+  ]
 }
 
 static_library("test_support") {
@@ -150,7 +166,6 @@ static_library("test_support") {
   ]
 
   deps = [
-    ":network_impl",
     ":patch_impl",
     ":unzip_impl",
     "//base",
@@ -218,7 +233,7 @@ source_set("unit_tests") {
   }
 
   deps = [
-    ":network_impl",
+    ":network",
     ":patch_impl",
     ":test_support",
     ":unit_tests_bundle_data",

components/update_client/DEPS

 include_rules = [
   "+components/client_update_protocol",
   "+components/crx_file",
+  "+components/data_use_measurement/core",
   "+components/services/patch",
   "+components/prefs",
   "+components/services/unzip",

components/update_client/url_fetcher_downloader.cc

@@ -14,6 +14,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/task/post_task.h"
 #include "base/task/task_traits.h"
+#include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/update_client/network.h"
 #include "components/update_client/utils.h"
 #include "url/gurl.h"

components/update_client/utils.cc

@@ -21,6 +21,7 @@
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
+#include "components/data_use_measurement/core/data_use_user_data.h"
 #include "components/update_client/component.h"
 #include "components/update_client/configurator.h"
 #include "components/update_client/network.h"

ios/chrome/browser/component_updater/BUILD.gn

@@ -11,7 +11,8 @@ source_set("component_updater") {
     "//base",
     "//components/component_updater",
     "//components/update_client",
-    "//components/update_client:common_impl",
+    "//components/update_client:patch_impl",
+    "//components/update_client:unzip_impl",
     "//ios/chrome/browser",
     "//ios/chrome/browser/google",
     "//ios/chrome/common",