From b1fc1b83eb6eb10a7ebaff22c76082c3f0629f36 Mon Sep 17 00:00:00 2001
From: brettw <brettw@chromium.org>
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/ui/cocoa/toolbar/toolbar_controller_unittest.mm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm')
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
index 10c8868..7167694 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
@@ -6,7 +6,6 @@
#import "base/mac/scoped_nsobject.h"
#include "base/macros.h"
-#include "base/prefs/pref_service.h"
#include "base/run_loop.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/command_updater.h"
@@ -21,6 +20,7 @@
#import "chrome/browser/ui/cocoa/view_resizer_pong.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/prefs/pref_service.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "testing/gtest_mac.h"
#include "testing/platform_test.h"
--
cgit v1.1