Move chrome_browser_state.{cc,h} to ios/chrome/browser/browser_state.

ios/chrome/browser/bookmarks/bookmark_model_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 
 #include <utility>
 
 #include "base/memory/singleton.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/browser/startup_task_runner_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/prefs/pref_service.h"
 #include "components/undo/bookmark_undo_service.h"
 #include "ios/chrome/browser/bookmarks/bookmark_client_impl.h"
 #include "ios/chrome/browser/bookmarks/startup_task_runner_service_factory.h"
 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
+#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #include "ios/chrome/browser/pref_names.h"
 #include "ios/chrome/browser/undo/bookmark_undo_service_factory.h"
-#include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/web/public/web_thread.h"
 
 namespace ios {
 
 // static
 bookmarks::BookmarkModel* BookmarkModelFactory::GetForBrowserState(
     ios::ChromeBrowserState* browser_state) {
   return static_cast<bookmarks::BookmarkModel*>(
       GetInstance()->GetServiceForBrowserState(browser_state, true));
 }
@@ skipping 47 matching lines @@
 web::BrowserState* BookmarkModelFactory::GetBrowserStateToUse(
     web::BrowserState* context) const {
   return GetBrowserStateRedirectedInIncognito(context);
 }
 
 bool BookmarkModelFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
 }  // namespace ios