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

components/bookmarks/test/bookmark_test_helpers.cc

 // Copyright 2014 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 "components/bookmarks/core/test/bookmark_test_helpers.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/core/browser/base_bookmark_model_observer.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/browser/base_bookmark_model_observer.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "url/gurl.h"
 
 namespace {
 
 // BookmarkLoadObserver is used when blocking until the BookmarkModel finishes
 // loading. As soon as the BookmarkModel finishes loading the message loop is
 // quit.
 class BookmarkLoadObserver : public BaseBookmarkModelObserver {
  public:
   explicit BookmarkLoadObserver(const base::Closure& quit_task);
@@ skipping 105 matching lines @@
                              const BookmarkNode* node,
                              const std::string& model_string) {
   DCHECK(node);
   std::string::size_type start_pos = 0;
   std::string::size_type end_pos =
       AddNodesFromString(model, node, model_string, start_pos);
   DCHECK(end_pos == std::string::npos);
 }
 
 }  // namespace test