diff options
| author | brettw <brettw@chromium.org> | 2015-10-09 14:30:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-09 21:31:32 +0000 |
| commit | e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1 (patch) | |
| tree | 98af999b13adc270b3acfc0138ca075e825d5bb2 /chrome/browser/metrics | |
| parent | ca46ae47bc66b875e5dacc554acd68500f92ccf8 (diff) | |
| download | chromium_src-e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1.zip chromium_src-e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1.tar.gz chromium_src-e1f0af8b5a296f334fdeb0c6d7d2563a3fd95bc1.tar.bz2 | |
Remove forward includes of component pref names in Chrome's list.
Previously chrome/common/pref_names.h included pref name headers from some components. Presumably these were added when the corresponding code was componentized to avoid updating all callers.
However, this causes problems for GN's dependency checker, which correctly identifies that these includes lack a dependency to go with them.
This removes the forward includes and adds the proper finer-grained includes where necessary. I tried to remove the include for pref_names.h in a few places where it is no longer needed.
Move some out
BUG=
Review URL: https://codereview.chromium.org/1395863003
Cr-Commit-Position: refs/heads/master@{#353388}
Diffstat (limited to 'chrome/browser/metrics')
4 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc index 1084714..983aba9 100644 --- a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc +++ b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc @@ -9,6 +9,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/testing_browser_process.h" +#include "components/metrics/metrics_pref_names.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index 0ac839f..67dec95 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc @@ -32,6 +32,7 @@ #include "components/metrics/call_stack_profile_metrics_provider.h" #include "components/metrics/drive_metrics_provider.h" #include "components/metrics/gpu/gpu_metrics_provider.h" +#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "components/metrics/net/net_metrics_log_uploader.h" #include "components/metrics/net/network_metrics_provider.h" diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc index e9d658e..0666443a 100644 --- a/chrome/browser/metrics/metrics_reporting_state.cc +++ b/chrome/browser/metrics/metrics_reporting_state.cc @@ -9,8 +9,8 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" -#include "chrome/common/pref_names.h" #include "chrome/installer/util/google_update_settings.h" +#include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index b3ca37f..13e8a67 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -18,10 +18,10 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" +#include "components/metrics/metrics_pref_names.h" #include "content/public/test/browser_test_utils.h" #include "net/base/filename_util.h" #include "ui/base/window_open_disposition.h" |