From b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 Mon Sep 17 00:00:00 2001 From: brettw Date: Mon, 1 Feb 2016 16:19:08 -0800 Subject: Update chrome for new prefs location. This is a search-and-replace update for includes with "base/prefs" -> "components/prefs" and the headers re-sorted in the chrome directory. DEPS files were updated to allow the components in question to depend on components/prefs. chrome/DEPS was updated to whitelist all components rather than listing all the ones it uses out individually. Checkdeps is a tool to enforce layering, and Chrome is allowed to depend on any component, so listing each one it uses doesn't help anything. This should be a no-op from a build perspective. BUG=583034 TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1658793002 Cr-Commit-Position: refs/heads/master@{#372827} --- chrome/browser/net/chrome_network_delegate.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/net/chrome_network_delegate.cc') diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index 0775d81..9d87e85 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -21,8 +21,6 @@ #include "base/metrics/sparse_histogram.h" #include "base/metrics/user_metrics.h" #include "base/path_service.h" -#include "base/prefs/pref_member.h" -#include "base/prefs/pref_service.h" #include "base/profiler/scoped_tracker.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -44,6 +42,8 @@ #include "components/content_settings/core/browser/cookie_settings.h" #include "components/data_usage/core/data_use_aggregator.h" #include "components/domain_reliability/monitor.h" +#include "components/prefs/pref_member.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" -- cgit v1.1