From f8f97687dcde65645c8218464fbf95bbe620a915 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Tue, 26 Apr 2016 22:12:52 -0400
Subject: [PATCH] Update to new pref service location in components

---
 brightray/browser/browser_context.cc               | 12 +++++++-----
 brightray/browser/inspectable_web_contents_impl.cc |  8 +++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/brightray/browser/browser_context.cc b/brightray/browser/browser_context.cc
index 11214bd38abc..12d1d3577414 100644
--- a/brightray/browser/browser_context.cc
+++ b/brightray/browser/browser_context.cc
@@ -13,10 +13,12 @@
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
-#include "base/prefs/json_pref_store.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/pref_service.h"
-#include "base/prefs/pref_service_factory.h"
+
+#include "components/prefs/json_pref_store.h"
+#include "components/prefs/pref_registry_simple.h"
+#include "components/prefs/pref_service.h"
+#include "components/prefs/pref_service_factory.h"
+
 #include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/resource_context.h"
@@ -112,7 +114,7 @@ BrowserContext::BrowserContext(const std::string& partition, bool in_memory)
 
 void BrowserContext::InitPrefs() {
   auto prefs_path = GetPath().Append(FILE_PATH_LITERAL("Preferences"));
-  base::PrefServiceFactory prefs_factory;
+  PrefServiceFactory prefs_factory;
   prefs_factory.SetUserPrefsFile(prefs_path,
       JsonPrefStore::GetTaskRunnerForFile(
           prefs_path, BrowserThread::GetBlockingPool()).get());
diff --git a/brightray/browser/inspectable_web_contents_impl.cc b/brightray/browser/inspectable_web_contents_impl.cc
index 71c981bb4095..09c5521c9483 100644
--- a/brightray/browser/inspectable_web_contents_impl.cc
+++ b/brightray/browser/inspectable_web_contents_impl.cc
@@ -15,9 +15,11 @@
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.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 "components/prefs/pref_service.h"
+#include "components/prefs/scoped_user_pref_update.h"
+#include "components/prefs/pref_registry_simple.h"
+
 #include "base/strings/pattern.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"