Move bookmarks/core/... to bookmarks/...

chrome/browser/importer/external_process_importer_host.cc

 // Copyright (c) 2012 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 "chrome/browser/importer/external_process_importer_host.h"
 
 #include "base/bind.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/importer/external_process_importer_client.h"
 #include "chrome/browser/importer/firefox_profile_lock.h"
 #include "chrome/browser/importer/importer_lock_dialog.h"
 #include "chrome/browser/importer/importer_progress_observer.h"
 #include "chrome/browser/importer/in_process_importer_bridge.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 ExternalProcessImporterHost::ExternalProcessImporterHost()
     : headless_(false),
       parent_window_(NULL),
       observer_(NULL),
       profile_(NULL),
       waiting_for_bookmarkbar_model_(false),
@@ skipping 175 matching lines @@
     if (!writer_->TemplateURLServiceIsLoaded()) {
       TemplateURLService* model =
           TemplateURLServiceFactory::GetForProfile(profile_);
       template_service_subscription_ = model->RegisterOnLoadedCallback(
           base::Bind(&ExternalProcessImporterHost::OnTemplateURLServiceLoaded,
                      weak_ptr_factory_.GetWeakPtr()));
       model->Load();
     }
   }
 }