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} --- .../browser/chromeos/policy/consumer_management_service_unittest.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chrome/browser/chromeos/policy/consumer_management_service_unittest.cc') diff --git a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc index 12565eb..8b85ad9 100644 --- a/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc +++ b/chrome/browser/chromeos/policy/consumer_management_service_unittest.cc @@ -7,8 +7,6 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/callback.h" -#include "base/prefs/pref_registry_simple.h" -#include "base/prefs/pref_service.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/policy/device_policy_builder.h" #include "chrome/browser/chromeos/settings/device_settings_test_helper.h" @@ -20,6 +18,8 @@ #include "chromeos/dbus/cryptohome/rpc.pb.h" #include "chromeos/dbus/cryptohome_client.h" #include "chromeos/dbus/mock_cryptohome_client.h" +#include "components/prefs/pref_registry_simple.h" +#include "components/prefs/pref_service.h" #include "policy/proto/device_management_backend.pb.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" -- cgit v1.1