[win] Fix data_deps bloat in //chrome/installer/setup:setup

r976024 introduced a dependency on //ui/base in //components/metrics, which led to extensive deps bloat for the installer. This, in turn, led to resource exhaustion causing debug component builds to break. This resolves the issue by moving the dependency into //components/metrics:ui. Bug: 1367403 Change-Id: I9a628264a186026435ff11c286ba08c2a17274f3 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3925579 Reviewed-by: Sylvain Defresne <sdefresne@chromium.org> Commit-Queue: Luc Nguyen <lucnguyen@google.com> Auto-Submit: Greg Thompson <grt@chromium.org> Reviewed-by: Luc Nguyen <lucnguyen@google.com> Reviewed-by: Alexei Svitkine <asvitkine@chromium.org> Reviewed-by: Olivier Robin <olivierrobin@chromium.org> Reviewed-by: Peter Boström <pbos@chromium.org> Cr-Commit-Position: refs/heads/main@{#1053078}
marcosholgado · Sep 29, 2022 · 95fc42a · 95fc42a
1 parent 78b55db
commit 95fc42a
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -84,7 +84,6 @@
 #include "components/metrics/demographics/demographic_metrics_provider.h"
 #include "components/metrics/drive_metrics_provider.h"
 #include "components/metrics/entropy_state_provider.h"
-#include "components/metrics/form_factor_metrics_provider.h"
 #include "components/metrics/metrics_log_uploader.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_reporting_default_state.h"
@@ -98,6 +97,7 @@
 #include "components/metrics/persistent_histograms.h"
 #include "components/metrics/sampling_metrics_provider.h"
 #include "components/metrics/stability_metrics_helper.h"
+#include "components/metrics/ui/form_factor_metrics_provider.h"
 #include "components/metrics/ui/screen_info_metrics_provider.h"
 #include "components/metrics/url_constants.h"
 #include "components/metrics/version_utils.h"

diff --git a/components/embedder_support/android/metrics/android_metrics_service_client.cc b/components/embedder_support/android/metrics/android_metrics_service_client.cc
@@ -37,7 +37,6 @@
 #include "components/metrics/drive_metrics_provider.h"
 #include "components/metrics/entropy_state_provider.h"
 #include "components/metrics/file_metrics_provider.h"
-#include "components/metrics/form_factor_metrics_provider.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_state_manager.h"
@@ -47,6 +46,7 @@
 #include "components/metrics/persistent_histograms.h"
 #include "components/metrics/sampling_metrics_provider.h"
 #include "components/metrics/stability_metrics_helper.h"
+#include "components/metrics/ui/form_factor_metrics_provider.h"
 #include "components/metrics/ui/screen_info_metrics_provider.h"
 #include "components/metrics/version_utils.h"
 #include "components/prefs/pref_service.h"

diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn
@@ -49,8 +49,6 @@ static_library("metrics") {
     "field_trials_provider.h",
     "file_metrics_provider.cc",
     "file_metrics_provider.h",
-    "form_factor_metrics_provider.cc",
-    "form_factor_metrics_provider.h",
     "log_decoder.cc",
     "log_decoder.h",
     "log_store.h",
@@ -137,7 +135,6 @@ static_library("metrics") {
     "//crypto",
     "//extensions/buildflags",
     "//third_party/icu",
-    "//ui/base",
     "//url",
   ]
 
@@ -335,13 +332,16 @@ static_library("net") {
 
 static_library("ui") {
   sources = [
+    "ui/form_factor_metrics_provider.cc",
+    "ui/form_factor_metrics_provider.h",
     "ui/screen_info_metrics_provider.cc",
     "ui/screen_info_metrics_provider.h",
   ]
 
   public_deps = [ ":metrics" ]
   deps = [
     "//base",
+    "//ui/base",
     "//ui/display",
     "//ui/gfx",
     "//ui/gfx/geometry",
@@ -474,7 +474,6 @@ source_set("unit_tests") {
     "expired_histograms_checker_unittest.cc",
     "field_trials_provider_unittest.cc",
     "file_metrics_provider_unittest.cc",
-    "form_factor_metrics_provider_unittest.cc",
     "histogram_encoder_unittest.cc",
     "library_support/histogram_manager_unittest.cc",
     "log_decoder_unittest.cc",
@@ -492,6 +491,7 @@ source_set("unit_tests") {
     "single_sample_metrics_factory_impl_unittest.cc",
     "stability_metrics_helper_unittest.cc",
     "stability_metrics_provider_unittest.cc",
+    "ui/form_factor_metrics_provider_unittest.cc",
     "ui/screen_info_metrics_provider_unittest.cc",
     "unsent_log_store_metrics_impl_unittest.cc",
     "unsent_log_store_unittest.cc",

diff --git a/components/metrics/DEPS b/components/metrics/DEPS
@@ -19,7 +19,6 @@ include_rules = [
   "+third_party/metrics_proto",
   "+third_party/zlib/google",
   "-net",
-  "+ui/base",
   "+url",
 ]
 

diff --git a/components/metrics/ui/DEPS b/components/metrics/ui/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+ui/base",
   "+ui/display",
   "+ui/gfx",
 ]
diff --git a/...s/metrics/form_factor_metrics_provider.cc → ...etrics/ui/form_factor_metrics_provider.cc b/...s/metrics/form_factor_metrics_provider.cc → ...etrics/ui/form_factor_metrics_provider.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/metrics/form_factor_metrics_provider.h"
+#include "components/metrics/ui/form_factor_metrics_provider.h"
 
 #include "build/build_config.h"
 #include "ui/base/device_form_factor.h"

diff --git a/...ts/metrics/form_factor_metrics_provider.h → ...metrics/ui/form_factor_metrics_provider.h b/...ts/metrics/form_factor_metrics_provider.h → ...metrics/ui/form_factor_metrics_provider.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_METRICS_FORM_FACTOR_METRICS_PROVIDER_H_
-#define COMPONENTS_METRICS_FORM_FACTOR_METRICS_PROVIDER_H_
+#ifndef COMPONENTS_METRICS_UI_FORM_FACTOR_METRICS_PROVIDER_H_
+#define COMPONENTS_METRICS_UI_FORM_FACTOR_METRICS_PROVIDER_H_
 
 #include "components/metrics/metrics_provider.h"
 #include "third_party/metrics_proto/system_profile.pb.h"
@@ -32,4 +32,4 @@ class FormFactorMetricsProvider : public MetricsProvider {
 
 }  // namespace metrics
 
-#endif  // COMPONENTS_METRICS_FORM_FACTOR_METRICS_PROVIDER_H_
+#endif  // COMPONENTS_METRICS_UI_FORM_FACTOR_METRICS_PROVIDER_H_
diff --git a/.../form_factor_metrics_provider_unittest.cc → .../form_factor_metrics_provider_unittest.cc b/.../form_factor_metrics_provider_unittest.cc → .../form_factor_metrics_provider_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/metrics/form_factor_metrics_provider.h"
+#include "components/metrics/ui/form_factor_metrics_provider.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/metrics_proto/system_profile.pb.h"

diff --git a/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm b/ios/chrome/browser/metrics/ios_chrome_metrics_service_client.mm
@@ -38,7 +38,6 @@
 #import "components/metrics/drive_metrics_provider.h"
 #import "components/metrics/entropy_state_provider.h"
 #import "components/metrics/field_trials_provider.h"
-#import "components/metrics/form_factor_metrics_provider.h"
 #import "components/metrics/metrics_data_validation.h"
 #import "components/metrics/metrics_log_uploader.h"
 #import "components/metrics/metrics_pref_names.h"
@@ -50,6 +49,7 @@
 #import "components/metrics/net/network_metrics_provider.h"
 #import "components/metrics/persistent_histograms.h"
 #import "components/metrics/stability_metrics_helper.h"
+#import "components/metrics/ui/form_factor_metrics_provider.h"
 #import "components/metrics/ui/screen_info_metrics_provider.h"
 #import "components/metrics/url_constants.h"
 #import "components/metrics/version_utils.h"
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,7 +19,6 @@ include_rules = [ @@
       "+third_party/metrics_proto",
       "+third_party/zlib/google",
       "-net",
-      "+ui/base",
       "+url",
     ]
@@ Expand Down @@