diff options
Diffstat (limited to 'chrome/browser/metrics')
11 files changed, 21 insertions, 21 deletions
diff --git a/chrome/browser/metrics/android_metrics_provider.cc b/chrome/browser/metrics/android_metrics_provider.cc index 94aadaf..cc6d196 100644 --- a/chrome/browser/metrics/android_metrics_provider.cc +++ b/chrome/browser/metrics/android_metrics_provider.cc @@ -5,13 +5,13 @@ #include "chrome/browser/metrics/android_metrics_provider.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/sys_info.h" #include "base/values.h" #include "chrome/browser/android/feature_utilities.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" namespace { diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor.cc b/chrome/browser/metrics/chrome_metrics_service_accessor.cc index 643afc2..c44d12a 100644 --- a/chrome/browser/metrics/chrome_metrics_service_accessor.cc +++ b/chrome/browser/metrics/chrome_metrics_service_accessor.cc @@ -4,11 +4,11 @@ #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/common/features.h" #include "chrome/common/pref_names.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc index d980cd9..5d2a3fb 100644 --- a/chrome/browser/metrics/chrome_metrics_service_client.cc +++ b/chrome/browser/metrics/chrome_metrics_service_client.cc @@ -14,8 +14,6 @@ #include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/rand_util.h" #include "base/strings/string16.h" #include "base/threading/platform_thread.h" @@ -46,6 +44,8 @@ #include "components/metrics/ui/screen_info_metrics_provider.h" #include "components/metrics/url_constants.h" #include "components/omnibox/browser/omnibox_metrics_provider.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/variations/variations_associated_data.h" #include "components/version_info/version_info.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc index 7e69f9a..5e6b5a3 100644 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc @@ -6,7 +6,6 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/browser/metrics/chrome_metrics_service_client.h" @@ -16,6 +15,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/installer/util/google_update_settings.h" #include "components/metrics/metrics_state_manager.h" +#include "components/prefs/pref_service.h" #include "components/rappor/rappor_service.h" #include "components/variations/service/variations_service.h" #include "content/public/browser/browser_thread.h" diff --git a/chrome/browser/metrics/chrome_stability_metrics_provider_unittest.cc b/chrome/browser/metrics/chrome_stability_metrics_provider_unittest.cc index fd95be7..fa454c1 100644 --- a/chrome/browser/metrics/chrome_stability_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/chrome_stability_metrics_provider_unittest.cc @@ -5,13 +5,13 @@ #include "chrome/browser/metrics/chrome_stability_metrics_provider.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/metrics/chromeos_metrics_provider.cc b/chrome/browser/metrics/chromeos_metrics_provider.cc index f1565ca..d099d57 100644 --- a/chrome/browser/metrics/chromeos_metrics_provider.cc +++ b/chrome/browser/metrics/chromeos_metrics_provider.cc @@ -6,8 +6,6 @@ #include <stddef.h> -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" @@ -17,6 +15,8 @@ #include "chromeos/system/statistics_provider.h" #include "components/metrics/metrics_service.h" #include "components/metrics/proto/chrome_user_metrics_extension.pb.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "components/user_manager/user_manager.h" #include "content/public/browser/browser_thread.h" #include "device/bluetooth/bluetooth_adapter.h" diff --git a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc index 42d6838..34bab35 100644 --- a/chrome/browser/metrics/extensions_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/extensions_metrics_provider_unittest.cc @@ -9,11 +9,11 @@ #include <string> #include "base/memory/scoped_ptr.h" -#include "base/prefs/testing_pref_service.h" #include "components/metrics/client_info.h" #include "components/metrics/metrics_service.h" #include "components/metrics/metrics_state_manager.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/testing_pref_service.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" #include "extensions/common/extension_set.h" diff --git a/chrome/browser/metrics/metrics_reporting_state.cc b/chrome/browser/metrics/metrics_reporting_state.cc index aa03fbb..367edfa 100644 --- a/chrome/browser/metrics/metrics_reporting_state.cc +++ b/chrome/browser/metrics/metrics_reporting_state.cc @@ -6,13 +6,13 @@ #include "base/callback.h" #include "base/metrics/histogram.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/chrome_metrics_service_accessor.h" #include "chrome/installer/util/google_update_settings.h" #include "components/metrics/metrics_pref_names.h" #include "components/metrics/metrics_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/metrics/metrics_service_browsertest.cc b/chrome/browser/metrics/metrics_service_browsertest.cc index 1ea1f51..2ba8c02 100644 --- a/chrome/browser/metrics/metrics_service_browsertest.cc +++ b/chrome/browser/metrics/metrics_service_browsertest.cc @@ -12,7 +12,6 @@ #include "base/command_line.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "base/prefs/pref_service.h" #include "build/build_config.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser.h" @@ -23,6 +22,7 @@ #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 "components/prefs/pref_service.h" #include "content/public/test/browser_test_utils.h" #include "net/base/filename_util.h" #include "ui/base/window_open_disposition.h" diff --git a/chrome/browser/metrics/plugin_metrics_provider.cc b/chrome/browser/metrics/plugin_metrics_provider.cc index e070e36..996bbd1 100644 --- a/chrome/browser/metrics/plugin_metrics_provider.cc +++ b/chrome/browser/metrics/plugin_metrics_provider.cc @@ -8,9 +8,6 @@ #include <string> -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" @@ -20,6 +17,9 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/common/pref_names.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/process_type.h" diff --git a/chrome/browser/metrics/plugin_metrics_provider_unittest.cc b/chrome/browser/metrics/plugin_metrics_provider_unittest.cc index 9504937..76151d2 100644 --- a/chrome/browser/metrics/plugin_metrics_provider_unittest.cc +++ b/chrome/browser/metrics/plugin_metrics_provider_unittest.cc @@ -9,13 +9,13 @@ #include <string> #include "base/macros.h" -#include "base/prefs/pref_service.h" -#include "base/prefs/scoped_user_pref_update.h" -#include "base/prefs/testing_pref_service.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/pref_names.h" #include "components/metrics/proto/system_profile.pb.h" +#include "components/prefs/pref_service.h" +#include "components/prefs/scoped_user_pref_update.h" +#include "components/prefs/testing_pref_service.h" #include "content/public/browser/child_process_data.h" #include "content/public/common/process_type.h" #include "content/public/common/webplugininfo.h" |