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

components/bookmarks/browser/bookmark_node_data.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/browser/bookmark_node_data.h"
+#include "components/bookmarks/browser/bookmark_node_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_utils.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 
 const char* BookmarkNodeData::kClipboardFormatString =
     "chromium/x-bookmark-entries";
 
 BookmarkNodeData::Element::Element() : is_url(false), id_(0) {
 }
 
 BookmarkNodeData::Element::Element(const BookmarkNode* node)
     : is_url(node->is_url()),
@@ skipping 103 matching lines @@
 
   if (nodes.empty())
     return false;
 
   for (size_t i = 0; i < nodes.size(); ++i)
     elements.push_back(Element(nodes[i]));
 
   return true;
 }
 
-bool BookmarkNodeData::ReadFromTuple(const GURL& url, const base::string16& title) {
+bool BookmarkNodeData::ReadFromTuple(const GURL& url,
+                                     const base::string16& title) {
   Clear();
 
   if (!url.is_valid())
     return false;
 
   Element element;
   element.title = title;
   element.url = url;
   element.is_url = true;
 
@@ skipping 128 matching lines @@
     const base::FilePath& profile_path) {
   DCHECK(profile_path_.empty());
   profile_path_ = profile_path;
 }
 
 bool BookmarkNodeData::IsFromProfilePath(
     const base::FilePath& profile_path) const {
   // An empty path means the data is not associated with any profile.
   return !profile_path_.empty() && profile_path_ == profile_path;
 }