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

Bookmarks is not a layered component, so there is no need for the two level deep
hierarchy, switch code from components/bookmarks/core/... to components/bookmarks/...

BUG=370434
TEST=components_unittests --gtest_filter=Bookmark*
R=blundell@chromium.org,sdefresne@chromium.org
TBR=thakis@chromium.org

Review URL: https://codereview.chromium.org/284893003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271675 0039d316-1c4b-4281-b951-d872f2087c98

48 files changed, 205 insertions, 203 deletions

diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi
index 9bcc08f..cef049f 100644
--- a/components/bookmarks.gypi
+++ b/components/bookmarks.gypi
@@ -5,7 +5,7 @@
 {
   'targets': [
     {
-      'target_name': 'bookmarks_core_browser',
+      'target_name': 'bookmarks_browser',
       'type': 'static_library',
       'include_dirs': [
         '..',
@@ -17,7 +17,7 @@
         '../ui/base/ui_base.gyp:ui_base',
         '../ui/gfx/gfx.gyp:gfx',
         '../url/url.gyp:url_lib',
-        'bookmarks_core_common',
+        'bookmarks_common',
         'components_strings.gyp:components_strings',
         'favicon_base',
         'query_parser',
@@ -25,41 +25,41 @@
         'pref_registry',
       ],
       'sources': [
-        'bookmarks/core/browser/base_bookmark_model_observer.cc',
-        'bookmarks/core/browser/base_bookmark_model_observer.h',
-        'bookmarks/core/browser/bookmark_client.cc',
-        'bookmarks/core/browser/bookmark_client.h',
-        'bookmarks/core/browser/bookmark_codec.cc',
-        'bookmarks/core/browser/bookmark_codec.h',
-        'bookmarks/core/browser/bookmark_expanded_state_tracker.cc',
-        'bookmarks/core/browser/bookmark_expanded_state_tracker.h',
-        'bookmarks/core/browser/bookmark_index.cc',
-        'bookmarks/core/browser/bookmark_index.h',
-        'bookmarks/core/browser/bookmark_match.cc',
-        'bookmarks/core/browser/bookmark_match.h',
-        'bookmarks/core/browser/bookmark_model.cc',
-        'bookmarks/core/browser/bookmark_model.h',
-        'bookmarks/core/browser/bookmark_model_observer.h',
-        'bookmarks/core/browser/bookmark_node.cc',
-        'bookmarks/core/browser/bookmark_node.h',
-        'bookmarks/core/browser/bookmark_node_data.cc',
-        'bookmarks/core/browser/bookmark_node_data.h',
-        'bookmarks/core/browser/bookmark_node_data_ios.cc',
-        'bookmarks/core/browser/bookmark_node_data_mac.cc',
-        'bookmarks/core/browser/bookmark_node_data_views.cc',
-        'bookmarks/core/browser/bookmark_pasteboard_helper_mac.h',
-        'bookmarks/core/browser/bookmark_pasteboard_helper_mac.mm',
-        'bookmarks/core/browser/bookmark_service.h',
-        'bookmarks/core/browser/bookmark_storage.cc',
-        'bookmarks/core/browser/bookmark_storage.h',
-        'bookmarks/core/browser/bookmark_utils.cc',
-        'bookmarks/core/browser/bookmark_utils.h',
-        'bookmarks/core/browser/scoped_group_bookmark_actions.cc',
-        'bookmarks/core/browser/scoped_group_bookmark_actions.h',
+        'bookmarks/browser/base_bookmark_model_observer.cc',
+        'bookmarks/browser/base_bookmark_model_observer.h',
+        'bookmarks/browser/bookmark_client.cc',
+        'bookmarks/browser/bookmark_client.h',
+        'bookmarks/browser/bookmark_codec.cc',
+        'bookmarks/browser/bookmark_codec.h',
+        'bookmarks/browser/bookmark_expanded_state_tracker.cc',
+        'bookmarks/browser/bookmark_expanded_state_tracker.h',
+        'bookmarks/browser/bookmark_index.cc',
+        'bookmarks/browser/bookmark_index.h',
+        'bookmarks/browser/bookmark_match.cc',
+        'bookmarks/browser/bookmark_match.h',
+        'bookmarks/browser/bookmark_model.cc',
+        'bookmarks/browser/bookmark_model.h',
+        'bookmarks/browser/bookmark_model_observer.h',
+        'bookmarks/browser/bookmark_node.cc',
+        'bookmarks/browser/bookmark_node.h',
+        'bookmarks/browser/bookmark_node_data.cc',
+        'bookmarks/browser/bookmark_node_data.h',
+        'bookmarks/browser/bookmark_node_data_ios.cc',
+        'bookmarks/browser/bookmark_node_data_mac.cc',
+        'bookmarks/browser/bookmark_node_data_views.cc',
+        'bookmarks/browser/bookmark_pasteboard_helper_mac.h',
+        'bookmarks/browser/bookmark_pasteboard_helper_mac.mm',
+        'bookmarks/browser/bookmark_service.h',
+        'bookmarks/browser/bookmark_storage.cc',
+        'bookmarks/browser/bookmark_storage.h',
+        'bookmarks/browser/bookmark_utils.cc',
+        'bookmarks/browser/bookmark_utils.h',
+        'bookmarks/browser/scoped_group_bookmark_actions.cc',
+        'bookmarks/browser/scoped_group_bookmark_actions.h',
       ],
     },
     {
-      'target_name': 'bookmarks_core_common',
+      'target_name': 'bookmarks_common',
       'type': 'static_library',
       'include_dirs': [
         '..',
@@ -68,14 +68,14 @@
         '../base/base.gyp:base',
       ],
       'sources': [
-        'bookmarks/core/common/bookmark_constants.cc',
-        'bookmarks/core/common/bookmark_constants.h',
-        'bookmarks/core/common/bookmark_pref_names.cc',
-        'bookmarks/core/common/bookmark_pref_names.h',
+        'bookmarks/common/bookmark_constants.cc',
+        'bookmarks/common/bookmark_constants.h',
+        'bookmarks/common/bookmark_pref_names.cc',
+        'bookmarks/common/bookmark_pref_names.h',
       ],
     },
     {
-      'target_name': 'bookmarks_core_test_support',
+      'target_name': 'bookmarks_test_support',
       'type': 'static_library',
       'include_dirs': [
         '..',
@@ -84,13 +84,13 @@
         '../base/base.gyp:base',
         '../ui/events/platform/events_platform.gyp:events_platform',
         '../url/url.gyp:url_lib',
-        'bookmarks_core_browser',
+        'bookmarks_browser',
       ],
       'sources': [
-        'bookmarks/core/test/bookmark_test_helpers.cc',
-        'bookmarks/core/test/bookmark_test_helpers.h',
-        'bookmarks/core/test/test_bookmark_client.cc',
-        'bookmarks/core/test/test_bookmark_client.h',
+        'bookmarks/test/bookmark_test_helpers.cc',
+        'bookmarks/test/bookmark_test_helpers.h',
+        'bookmarks/test/test_bookmark_client.cc',
+        'bookmarks/test/test_bookmark_client.h',
       ],
       'conditions': [
         ['use_x11==1', {
diff --git a/components/bookmarks/core/browser/base_bookmark_model_observer.cc b/components/bookmarks/browser/base_bookmark_model_observer.cc
index a150c16..4cf4289 100644
--- a/components/bookmarks/core/browser/base_bookmark_model_observer.cc
+++ b/components/bookmarks/browser/base_bookmark_model_observer.cc
@@ -2,7 +2,7 @@
 // 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/base_bookmark_model_observer.h"
+#include "components/bookmarks/browser/base_bookmark_model_observer.h"
 
 void BaseBookmarkModelObserver::BookmarkModelLoaded(BookmarkModel* model,
                                                     bool ids_reassigned) {}
diff --git a/components/bookmarks/core/browser/base_bookmark_model_observer.h b/components/bookmarks/browser/base_bookmark_model_observer.h
index a20394d..04003f9 100644
--- a/components/bookmarks/core/browser/base_bookmark_model_observer.h
+++ b/components/bookmarks/browser/base_bookmark_model_observer.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BASE_BOOKMARK_MODEL_OBSERVER_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BASE_BOOKMARK_MODEL_OBSERVER_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BASE_BOOKMARK_MODEL_OBSERVER_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BASE_BOOKMARK_MODEL_OBSERVER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/bookmarks/core/browser/bookmark_model_observer.h"
+#include "components/bookmarks/browser/bookmark_model_observer.h"
 
 // Base class for a BookmarkModelObserver implementation. All mutations of the
 // model funnel into the method BookmarkModelChanged.
@@ -51,4 +51,4 @@ class BaseBookmarkModelObserver : public BookmarkModelObserver {
   DISALLOW_COPY_AND_ASSIGN(BaseBookmarkModelObserver);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BASE_BOOKMARK_MODEL_OBSERVER_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BASE_BOOKMARK_MODEL_OBSERVER_H_
diff --git a/components/bookmarks/core/browser/bookmark_client.cc b/components/bookmarks/browser/bookmark_client.cc
index 4b600e3..8d8ed94 100644
--- a/components/bookmarks/core/browser/bookmark_client.cc
+++ b/components/bookmarks/browser/bookmark_client.cc
@@ -2,7 +2,7 @@
 // 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_client.h"
+#include "components/bookmarks/browser/bookmark_client.h"
 
 #include "base/logging.h"
 
diff --git a/components/bookmarks/core/browser/bookmark_client.h b/components/bookmarks/browser/bookmark_client.h
index 35ac509..77ed563 100644
--- a/components/bookmarks/core/browser/bookmark_client.h
+++ b/components/bookmarks/browser/bookmark_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CLIENT_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CLIENT_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CLIENT_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CLIENT_H_
 
 #include <set>
 #include <utility>
@@ -74,4 +74,4 @@ class BookmarkClient {
   virtual ~BookmarkClient() {}
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CLIENT_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CLIENT_H_
diff --git a/components/bookmarks/core/browser/bookmark_codec.cc b/components/bookmarks/browser/bookmark_codec.cc
index dfad469..413ee9c 100644
--- a/components/bookmarks/core/browser/bookmark_codec.cc
+++ b/components/bookmarks/browser/bookmark_codec.cc
@@ -2,7 +2,7 @@
 // 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_codec.h"
+#include "components/bookmarks/browser/bookmark_codec.h"
 
 #include <algorithm>
 
@@ -10,7 +10,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
diff --git a/components/bookmarks/core/browser/bookmark_codec.h b/components/bookmarks/browser/bookmark_codec.h
index 909ed6e..ceca9c0 100644
--- a/components/bookmarks/core/browser/bookmark_codec.h
+++ b/components/bookmarks/browser/bookmark_codec.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CODEC_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CODEC_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CODEC_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CODEC_H_
 
 #include <set>
 #include <string>
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/md5.h"
 #include "base/strings/string16.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_node.h"
 
 class BookmarkModel;
 
@@ -204,4 +204,4 @@ class BookmarkCodec {
   DISALLOW_COPY_AND_ASSIGN(BookmarkCodec);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_CODEC_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_CODEC_H_
diff --git a/components/bookmarks/core/browser/bookmark_codec_unittest.cc b/components/bookmarks/browser/bookmark_codec_unittest.cc
index 4321eb9..6279f92 100644
--- a/components/bookmarks/core/browser/bookmark_codec_unittest.cc
+++ b/components/bookmarks/browser/bookmark_codec_unittest.cc
@@ -2,7 +2,7 @@
 // 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_codec.h"
+#include "components/bookmarks/browser/bookmark_codec.h"
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ -13,8 +13,8 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
diff --git a/components/bookmarks/core/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
index 2a7bf34..a79d9ed 100644
--- a/components/bookmarks/core/browser/bookmark_expanded_state_tracker.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc
@@ -2,14 +2,14 @@
 // 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_expanded_state_tracker.h"
+#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/browser/bookmark_utils.h"
-#include "components/bookmarks/core/common/bookmark_pref_names.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
+#include "components/bookmarks/common/bookmark_pref_names.h"
 
 BookmarkExpandedStateTracker::BookmarkExpandedStateTracker(
     BookmarkModel* bookmark_model,
diff --git a/components/bookmarks/core/browser/bookmark_expanded_state_tracker.h b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
index 77d3391..9473a2a 100644
--- a/components/bookmarks/core/browser/bookmark_expanded_state_tracker.h
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
 
 #include <set>
 
-#include "components/bookmarks/core/browser/base_bookmark_model_observer.h"
+#include "components/bookmarks/browser/base_bookmark_model_observer.h"
 
 class BookmarkModel;
 class BookmarkNode;
@@ -53,4 +53,4 @@ class BookmarkExpandedStateTracker : public BaseBookmarkModelObserver {
   DISALLOW_COPY_AND_ASSIGN(BookmarkExpandedStateTracker);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_EXPANDED_STATE_TRACKER_H_
diff --git a/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
index b45d954..71cb2d0 100644
--- a/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -2,7 +2,7 @@
 // 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_expanded_state_tracker.h"
+#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
 
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
@@ -11,10 +11,10 @@
 #include "base/prefs/testing_pref_store.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/common/bookmark_pref_names.h"
-#include "components/bookmarks/core/test/bookmark_test_helpers.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/common/bookmark_pref_names.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/components/bookmarks/core/browser/bookmark_index.cc b/components/bookmarks/browser/bookmark_index.cc
index 824f220..00a4902 100644
--- a/components/bookmarks/core/browser/bookmark_index.cc
+++ b/components/bookmarks/browser/bookmark_index.cc
@@ -2,7 +2,7 @@
 // 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_index.h"
+#include "components/bookmarks/browser/bookmark_index.h"
 
 #include <algorithm>
 #include <functional>
@@ -12,10 +12,10 @@
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/strings/utf_offset_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_client.h"
-#include "components/bookmarks/core/browser/bookmark_match.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
-#include "components/bookmarks/core/browser/bookmark_utils.h"
+#include "components/bookmarks/browser/bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_match.h"
+#include "components/bookmarks/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/query_parser/snippet.h"
 #include "third_party/icu/source/common/unicode/normalizer2.h"
 
diff --git a/components/bookmarks/core/browser/bookmark_index.h b/components/bookmarks/browser/bookmark_index.h
index f82742c..fed0ab3 100644
--- a/components/bookmarks/core/browser/bookmark_index.h
+++ b/components/bookmarks/browser/bookmark_index.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_INDEX_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_INDEX_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_INDEX_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_INDEX_H_
 
 #include <map>
 #include <set>
@@ -117,4 +117,4 @@ class BookmarkIndex {
   DISALLOW_COPY_AND_ASSIGN(BookmarkIndex);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_INDEX_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_INDEX_H_
diff --git a/components/bookmarks/core/browser/bookmark_index_unittest.cc b/components/bookmarks/browser/bookmark_index_unittest.cc
index b4094d0..1153412 100644
--- a/components/bookmarks/core/browser/bookmark_index_unittest.cc
+++ b/components/bookmarks/browser/bookmark_index_unittest.cc
@@ -2,7 +2,7 @@
 // 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_index.h"
+#include "components/bookmarks/browser/bookmark_index.h"
 
 #include <string>
 #include <vector>
@@ -12,10 +12,10 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_match.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/test/bookmark_test_helpers.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_match.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
diff --git a/components/bookmarks/core/browser/bookmark_match.cc b/components/bookmarks/browser/bookmark_match.cc
index 6a3d303..29ad044 100644
--- a/components/bookmarks/core/browser/bookmark_match.cc
+++ b/components/bookmarks/browser/bookmark_match.cc
@@ -2,7 +2,7 @@
 // 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_match.h"
+#include "components/bookmarks/browser/bookmark_match.h"
 
 #include "base/logging.h"
 #include "base/strings/string16.h"
diff --git a/components/bookmarks/core/browser/bookmark_match.h b/components/bookmarks/browser/bookmark_match.h
index b53f9c8..c033e4f3 100644
--- a/components/bookmarks/core/browser/bookmark_match.h
+++ b/components/bookmarks/browser/bookmark_match.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_TITLE_MATCH_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_TITLE_MATCH_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_TITLE_MATCH_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_TITLE_MATCH_H_
 
 #include <cstddef>
 #include <utility>
@@ -41,4 +41,4 @@ struct BookmarkMatch {
   MatchPositions url_match_positions;
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_TITLE_MATCH_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_TITLE_MATCH_H_
diff --git a/components/bookmarks/core/browser/bookmark_model.cc b/components/bookmarks/browser/bookmark_model.cc
index 2791146..3caf661 100644
--- a/components/bookmarks/core/browser/bookmark_model.cc
+++ b/components/bookmarks/browser/bookmark_model.cc
@@ -2,7 +2,7 @@
 // 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_model.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
@@ -13,13 +13,13 @@
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
-#include "components/bookmarks/core/browser/bookmark_expanded_state_tracker.h"
-#include "components/bookmarks/core/browser/bookmark_index.h"
-#include "components/bookmarks/core/browser/bookmark_match.h"
-#include "components/bookmarks/core/browser/bookmark_model_observer.h"
-#include "components/bookmarks/core/browser/bookmark_node_data.h"
-#include "components/bookmarks/core/browser/bookmark_storage.h"
-#include "components/bookmarks/core/browser/bookmark_utils.h"
+#include "components/bookmarks/browser/bookmark_expanded_state_tracker.h"
+#include "components/bookmarks/browser/bookmark_index.h"
+#include "components/bookmarks/browser/bookmark_match.h"
+#include "components/bookmarks/browser/bookmark_model_observer.h"
+#include "components/bookmarks/browser/bookmark_node_data.h"
+#include "components/bookmarks/browser/bookmark_storage.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/favicon_base/favicon_types.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
diff --git a/components/bookmarks/core/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h
index 818929f..de7a2c8 100644
--- a/components/bookmarks/core/browser/bookmark_model.h
+++ b/components/bookmarks/browser/bookmark_model.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
 
 #include <map>
 #include <set>
@@ -17,9 +17,9 @@
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
-#include "components/bookmarks/core/browser/bookmark_client.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
-#include "components/bookmarks/core/browser/bookmark_service.h"
+#include "components/bookmarks/browser/bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_service.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
 
@@ -421,4 +421,4 @@ class BookmarkModel : public BookmarkService {
   DISALLOW_COPY_AND_ASSIGN(BookmarkModel);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_H_
diff --git a/components/bookmarks/core/browser/bookmark_model_observer.h b/components/bookmarks/browser/bookmark_model_observer.h
index 2377ae4..8091758 100644
--- a/components/bookmarks/core/browser/bookmark_model_observer.h
+++ b/components/bookmarks/browser/bookmark_model_observer.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_OBSERVER_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_OBSERVER_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_OBSERVER_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_OBSERVER_H_
 
 #include <set>
 
@@ -121,4 +121,4 @@ class BookmarkModelObserver {
   virtual ~BookmarkModelObserver() {}
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_MODEL_OBSERVER_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_MODEL_OBSERVER_H_
diff --git a/components/bookmarks/core/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc
index b721485..6d7eeef 100644
--- a/components/bookmarks/core/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_model.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 
 #include <set>
 #include <string>
@@ -19,10 +19,10 @@
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "components/bookmarks/core/browser/bookmark_model_observer.h"
-#include "components/bookmarks/core/browser/bookmark_utils.h"
-#include "components/bookmarks/core/test/bookmark_test_helpers.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_model_observer.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/tree_node_iterator.h"
 #include "ui/base/models/tree_node_model.h"
diff --git a/components/bookmarks/core/browser/bookmark_node.cc b/components/bookmarks/browser/bookmark_node.cc
index 89a2617..cd9fe0e 100644
--- a/components/bookmarks/core/browser/bookmark_node.cc
+++ b/components/bookmarks/browser/bookmark_node.cc
@@ -2,7 +2,7 @@
 // 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.h"
+#include "components/bookmarks/browser/bookmark_node.h"
 
 #include <map>
 #include <string>
diff --git a/components/bookmarks/core/browser/bookmark_node.h b/components/bookmarks/browser/bookmark_node.h
index 6ed275b..f53c0d0 100644
--- a/components/bookmarks/core/browser/bookmark_node.h
+++ b/components/bookmarks/browser/bookmark_node.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_NODE_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_NODE_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/task/cancelable_task_tracker.h"
@@ -209,4 +209,4 @@ class BookmarkPermanentNode : public BookmarkNode {
   DISALLOW_COPY_AND_ASSIGN(BookmarkPermanentNode);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_NODE_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_H_
diff --git a/components/bookmarks/core/browser/bookmark_node_data.cc b/components/bookmarks/browser/bookmark_node_data.cc
index 0e356eb..0e36d0a 100644
--- a/components/bookmarks/core/browser/bookmark_node_data.cc
+++ b/components/bookmarks/browser/bookmark_node_data.cc
@@ -2,7 +2,7 @@
 // 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>
 
@@ -10,7 +10,7 @@
 #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 =
@@ -134,7 +134,8 @@ bool BookmarkNodeData::ReadFromVector(
   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())
diff --git a/components/bookmarks/core/browser/bookmark_node_data.h b/components/bookmarks/browser/bookmark_node_data.h
index 303223f..9fdf975 100644
--- a/components/bookmarks/core/browser/bookmark_node_data.h
+++ b/components/bookmarks/browser/bookmark_node_data.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_NODE_DATA_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_NODE_DATA_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_
 
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_node.h"
 #include "ui/base/clipboard/clipboard_types.h"
 
 #include "url/gurl.h"
@@ -171,4 +171,4 @@ struct BookmarkNodeData {
   base::FilePath profile_path_;
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_NODE_DATA_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_NODE_DATA_H_
diff --git a/components/bookmarks/core/browser/bookmark_node_data_ios.cc b/components/bookmarks/browser/bookmark_node_data_ios.cc
index 861b2eb..cbf6e8d 100644
--- a/components/bookmarks/core/browser/bookmark_node_data_ios.cc
+++ b/components/bookmarks/browser/bookmark_node_data_ios.cc
@@ -2,7 +2,7 @@
 // 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 "base/logging.h"
 
diff --git a/components/bookmarks/core/browser/bookmark_node_data_mac.cc b/components/bookmarks/browser/bookmark_node_data_mac.cc
index dba2920..1523885 100644
--- a/components/bookmarks/core/browser/bookmark_node_data_mac.cc
+++ b/components/bookmarks/browser/bookmark_node_data_mac.cc
@@ -2,9 +2,9 @@
 // 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 "components/bookmarks/core/browser/bookmark_pasteboard_helper_mac.h"
+#include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
 
 // static
 bool BookmarkNodeData::ClipboardContainsBookmarks() {
diff --git a/components/bookmarks/core/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc
index 1553b94..bda1047 100644
--- a/components/bookmarks/core/browser/bookmark_node_data_unittest.cc
+++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/browser/bookmark_node_data.h"
-#include "components/bookmarks/core/test/bookmark_test_helpers.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_node_data.h"
+#include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/events/platform/platform_event_source.h"
diff --git a/components/bookmarks/core/browser/bookmark_node_data_views.cc b/components/bookmarks/browser/bookmark_node_data_views.cc
index b5c99fe..b34116a 100644
--- a/components/bookmarks/core/browser/bookmark_node_data_views.cc
+++ b/components/bookmarks/browser/bookmark_node_data_views.cc
@@ -2,7 +2,7 @@
 // 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 "base/logging.h"
 #include "base/pickle.h"
diff --git a/components/bookmarks/core/browser/bookmark_pasteboard_helper_mac.h b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h
index c990e12..aecb727 100644
--- a/components/bookmarks/core/browser/bookmark_pasteboard_helper_mac.h
+++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
 
-#include "components/bookmarks/core/browser/bookmark_node_data.h"
+#include "components/bookmarks/browser/bookmark_node_data.h"
 
 #if defined(__OBJC__)
 @class NSString;
@@ -40,4 +40,4 @@ bool PasteboardContainsBookmarks(ui::ClipboardType type);
 extern "C" NSString* const kBookmarkDictionaryListPboardType;
 #endif  // __OBJC__
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_PASTEBOARD_HELPER_MAC_H_
diff --git a/components/bookmarks/core/browser/bookmark_pasteboard_helper_mac.mm b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm
index 04e2df7..845929a 100644
--- a/components/bookmarks/core/browser/bookmark_pasteboard_helper_mac.mm
+++ b/components/bookmarks/browser/bookmark_pasteboard_helper_mac.mm
@@ -2,13 +2,13 @@
 // 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_pasteboard_helper_mac.h"
+#include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/files/file_path.h"
 #include "base/strings/sys_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_node.h"
 #include "ui/base/clipboard/clipboard.h"
 
 NSString* const kBookmarkDictionaryListPboardType =
@@ -100,7 +100,8 @@ bool ReadWebURLsWithTitlesPboardType(
 
   NSUInteger len = [titlesArr count];
   for (NSUInteger i = 0; i < len; ++i) {
-    base::string16 title = base::SysNSStringToUTF16([titlesArr objectAtIndex:i]);
+    base::string16 title =
+        base::SysNSStringToUTF16([titlesArr objectAtIndex:i]);
     std::string url = base::SysNSStringToUTF8([urlsArr objectAtIndex:i]);
     if (!url.empty()) {
       BookmarkNodeData::Element element;
diff --git a/components/bookmarks/core/browser/bookmark_service.h b/components/bookmarks/browser/bookmark_service.h
index 3aaa076..22c5568 100644
--- a/components/bookmarks/core/browser/bookmark_service.h
+++ b/components/bookmarks/browser/bookmark_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_SERVICE_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_SERVICE_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_SERVICE_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_SERVICE_H_
 
 #include <vector>
 
@@ -40,4 +40,4 @@ class BookmarkService {
   virtual ~BookmarkService() {}
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_SERVICE_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_SERVICE_H_
diff --git a/components/bookmarks/core/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc
index 29709c4..f8a20de 100644
--- a/components/bookmarks/core/browser/bookmark_storage.cc
+++ b/components/bookmarks/browser/bookmark_storage.cc
@@ -2,7 +2,7 @@
 // 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_storage.h"
+#include "components/bookmarks/browser/bookmark_storage.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ -12,10 +12,10 @@
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner.h"
 #include "base/time/time.h"
-#include "components/bookmarks/core/browser/bookmark_codec.h"
-#include "components/bookmarks/core/browser/bookmark_index.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/common/bookmark_constants.h"
+#include "components/bookmarks/browser/bookmark_codec.h"
+#include "components/bookmarks/browser/bookmark_index.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/common/bookmark_constants.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
 
 using base::TimeTicks;
diff --git a/components/bookmarks/core/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h
index 4e0cd24..ac8a69c 100644
--- a/components/bookmarks/core/browser/bookmark_storage.h
+++ b/components/bookmarks/browser/bookmark_storage.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_STORAGE_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_STORAGE_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_
 
 #include "base/files/file_path.h"
 #include "base/files/important_file_writer.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_node.h"
 
 class BookmarkIndex;
 class BookmarkModel;
@@ -163,4 +163,4 @@ class BookmarkStorage : public base::ImportantFileWriter::DataSerializer,
   DISALLOW_COPY_AND_ASSIGN(BookmarkStorage);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_STORAGE_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_STORAGE_H_
diff --git a/components/bookmarks/core/browser/bookmark_utils.cc b/components/bookmarks/browser/bookmark_utils.cc
index 8baec23..b687937 100644
--- a/components/bookmarks/core/browser/bookmark_utils.cc
+++ b/components/bookmarks/browser/bookmark_utils.cc
@@ -2,7 +2,7 @@
 // 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_utils.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
 
 #include <utility>
 
@@ -14,9 +14,9 @@
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/browser/scoped_group_bookmark_actions.h"
-#include "components/bookmarks/core/common/bookmark_pref_names.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
+#include "components/bookmarks/common/bookmark_pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/query_parser/query_parser.h"
 #include "net/base/net_util.h"
diff --git a/components/bookmarks/core/browser/bookmark_utils.h b/components/bookmarks/browser/bookmark_utils.h
index a094169..c798e17 100644
--- a/components/bookmarks/core/browser/bookmark_utils.h
+++ b/components/bookmarks/browser/bookmark_utils.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_UTILS_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_UTILS_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/strings/utf_offset_string_conversions.h"
-#include "components/bookmarks/core/browser/bookmark_node_data.h"
+#include "components/bookmarks/browser/bookmark_node_data.h"
 
 class BookmarkModel;
 class BookmarkNode;
@@ -141,4 +141,4 @@ base::string16 CleanUpTitleForMatching(const base::string16& title);
 // Returns the node with |id|, or NULL if there is no node with |id|.
 const BookmarkNode* GetBookmarkNodeByID(const BookmarkModel* model, int64 id);
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_BOOKMARK_UTILS_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_UTILS_H_
diff --git a/components/bookmarks/core/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index d090f36..724d234 100644
--- a/components/bookmarks/core/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -1,17 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_utils.h"
+#include "components/bookmarks/browser/bookmark_utils.h"
 
 #include <vector>
 
 #include "base/message_loop/message_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/core/browser/bookmark_node_data.h"
-#include "components/bookmarks/core/test/test_bookmark_client.h"
+#include "components/bookmarks/browser/base_bookmark_model_observer.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_node_data.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
diff --git a/components/bookmarks/core/browser/scoped_group_bookmark_actions.cc b/components/bookmarks/browser/scoped_group_bookmark_actions.cc
index 38d779c..b928eba 100644
--- a/components/bookmarks/core/browser/scoped_group_bookmark_actions.cc
+++ b/components/bookmarks/browser/scoped_group_bookmark_actions.cc
@@ -2,9 +2,9 @@
 // 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/scoped_group_bookmark_actions.h"
+#include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
 
-#include "components/bookmarks/core/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 
 ScopedGroupBookmarkActions::ScopedGroupBookmarkActions(BookmarkModel* model)
     : model_(model) {
diff --git a/components/bookmarks/core/browser/scoped_group_bookmark_actions.h b/components/bookmarks/browser/scoped_group_bookmark_actions.h
index e3b317b..5a751d1 100644
--- a/components/bookmarks/core/browser/scoped_group_bookmark_actions.h
+++ b/components/bookmarks/browser/scoped_group_bookmark_actions.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_BROWSER_SCOPED_GROUP_BOOKMARK_ACTIONS_H_
-#define COMPONENTS_BOOKMARKS_CORE_BROWSER_SCOPED_GROUP_BOOKMARK_ACTIONS_H_
+#ifndef COMPONENTS_BOOKMARKS_BROWSER_SCOPED_GROUP_BOOKMARK_ACTIONS_H_
+#define COMPONENTS_BOOKMARKS_BROWSER_SCOPED_GROUP_BOOKMARK_ACTIONS_H_
 
 #include "base/macros.h"
 
@@ -21,4 +21,4 @@ class ScopedGroupBookmarkActions {
   DISALLOW_COPY_AND_ASSIGN(ScopedGroupBookmarkActions);
 };
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_BROWSER_SCOPED_GROUP_BOOKMARK_ACTIONS_H_
+#endif  // COMPONENTS_BOOKMARKS_BROWSER_SCOPED_GROUP_BOOKMARK_ACTIONS_H_
diff --git a/components/bookmarks/core/common/bookmark_constants.cc b/components/bookmarks/common/bookmark_constants.cc
index 7e64463..6c2e5a6 100644
--- a/components/bookmarks/core/common/bookmark_constants.cc
+++ b/components/bookmarks/common/bookmark_constants.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/bookmarks/core/common/bookmark_constants.h"
+#include "components/bookmarks/common/bookmark_constants.h"
 
 #define FPL FILE_PATH_LITERAL
 
diff --git a/components/bookmarks/core/common/bookmark_constants.h b/components/bookmarks/common/bookmark_constants.h
index bfd0205..7b1a8f5 100644
--- a/components/bookmarks/core/common/bookmark_constants.h
+++ b/components/bookmarks/common/bookmark_constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_COMMON_BOOKMARK_CONSTANTS_H_
-#define COMPONENTS_BOOKMARKS_CORE_COMMON_BOOKMARK_CONSTANTS_H_
+#ifndef COMPONENTS_BOOKMARKS_COMMON_BOOKMARK_CONSTANTS_H_
+#define COMPONENTS_BOOKMARKS_COMMON_BOOKMARK_CONSTANTS_H_
 
 #include "base/files/file_path.h"
 
@@ -13,4 +13,4 @@ extern const base::FilePath::CharType kBookmarksFileName[];
 
 }  // namespace bookmarks
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_COMMON_BOOKMARK_CONSTANTS_H_
+#endif  // COMPONENTS_BOOKMARKS_COMMON_BOOKMARK_CONSTANTS_H_
diff --git a/components/bookmarks/core/common/bookmark_pref_names.cc b/components/bookmarks/common/bookmark_pref_names.cc
index a3b8089..fc64aa1 100644
--- a/components/bookmarks/core/common/bookmark_pref_names.cc
+++ b/components/bookmarks/common/bookmark_pref_names.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/bookmarks/core/common/bookmark_pref_names.h"
+#include "components/bookmarks/common/bookmark_pref_names.h"
 
 namespace prefs {
 
diff --git a/components/bookmarks/core/common/bookmark_pref_names.h b/components/bookmarks/common/bookmark_pref_names.h
index 4fc47d0..3cc3280 100644
--- a/components/bookmarks/core/common/bookmark_pref_names.h
+++ b/components/bookmarks/common/bookmark_pref_names.h
@@ -4,8 +4,8 @@
 
 // Constants for the names of various bookmarks preferences.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_COMMON_BOOKMARK_PREF_NAMES_H_
-#define COMPONENTS_BOOKMARKS_CORE_COMMON_BOOKMARK_PREF_NAMES_H_
+#ifndef COMPONENTS_BOOKMARKS_COMMON_BOOKMARK_PREF_NAMES_H_
+#define COMPONENTS_BOOKMARKS_COMMON_BOOKMARK_PREF_NAMES_H_
 
 namespace prefs {
 
@@ -16,4 +16,4 @@ extern const char kShowAppsShortcutInBookmarkBar[];
 
 }  // namespace prefs
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_COMMON_BOOKMARK_PREF_NAMES_H_
+#endif  // COMPONENTS_BOOKMARKS_COMMON_BOOKMARK_PREF_NAMES_H_
diff --git a/components/bookmarks/core/test/bookmark_test_helpers.cc b/components/bookmarks/test/bookmark_test_helpers.cc
index 86d9ee2..ce7fbe8 100644
--- a/components/bookmarks/core/test/bookmark_test_helpers.cc
+++ b/components/bookmarks/test/bookmark_test_helpers.cc
@@ -2,7 +2,7 @@
 // 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"
@@ -10,8 +10,8 @@
 #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 {
diff --git a/components/bookmarks/core/test/bookmark_test_helpers.h b/components/bookmarks/test/bookmark_test_helpers.h
index a6467fa..cd107dd 100644
--- a/components/bookmarks/core/test/bookmark_test_helpers.h
+++ b/components/bookmarks/test/bookmark_test_helpers.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_TEST_BOOKMARK_TEST_HELPERS_H_
-#define COMPONENTS_BOOKMARKS_CORE_TEST_BOOKMARK_TEST_HELPERS_H_
+#ifndef COMPONENTS_BOOKMARKS_TEST_BOOKMARK_TEST_HELPERS_H_
+#define COMPONENTS_BOOKMARKS_TEST_BOOKMARK_TEST_HELPERS_H_
 
 #include <string>
 
@@ -42,4 +42,4 @@ void AddNodesFromModelString(BookmarkModel* model,
                              const std::string& model_string);
 }  // namespace test
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_TEST_BOOKMARK_TEST_HELPERS_H_
+#endif  // COMPONENTS_BOOKMARKS_TEST_BOOKMARK_TEST_HELPERS_H_
diff --git a/components/bookmarks/core/test/test_bookmark_client.cc b/components/bookmarks/test/test_bookmark_client.cc
index 6c98398..6151032 100644
--- a/components/bookmarks/core/test/test_bookmark_client.cc
+++ b/components/bookmarks/test/test_bookmark_client.cc
@@ -2,12 +2,12 @@
 // 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/test_bookmark_client.h"
+#include "components/bookmarks/test/test_bookmark_client.h"
 
 #include "base/logging.h"
-#include "components/bookmarks/core/browser/bookmark_model.h"
-#include "components/bookmarks/core/browser/bookmark_node.h"
-#include "components/bookmarks/core/browser/bookmark_storage.h"
+#include "components/bookmarks/browser/bookmark_model.h"
+#include "components/bookmarks/browser/bookmark_node.h"
+#include "components/bookmarks/browser/bookmark_storage.h"
 
 namespace test {
 
diff --git a/components/bookmarks/core/test/test_bookmark_client.h b/components/bookmarks/test/test_bookmark_client.h
index 7115ffd..1330728 100644
--- a/components/bookmarks/core/test/test_bookmark_client.h
+++ b/components/bookmarks/test/test_bookmark_client.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_BOOKMARKS_CORE_TEST_TEST_BOOKMARK_CLIENT_H_
-#define COMPONENTS_BOOKMARKS_CORE_TEST_TEST_BOOKMARK_CLIENT_H_
+#ifndef COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_
+#define COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "components/bookmarks/core/browser/bookmark_client.h"
+#include "components/bookmarks/browser/bookmark_client.h"
 
 class BookmarkModel;
 
@@ -31,4 +31,4 @@ class TestBookmarkClient : public BookmarkClient {
 
 }  // namespace test
 
-#endif  // COMPONENTS_BOOKMARKS_CORE_TEST_TEST_BOOKMARK_CLIENT_H_
+#endif  // COMPONENTS_BOOKMARKS_TEST_TEST_BOOKMARK_CLIENT_H_
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index e13fbc0..6f2e098 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -63,11 +63,11 @@
             'autofill/core/common/form_field_data_unittest.cc',
             'autofill/core/common/password_form_fill_data_unittest.cc',
             'autofill/core/common/save_password_progress_logger_unittest.cc',
-            'bookmarks/core/browser/bookmark_codec_unittest.cc',
-            'bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc',
-            'bookmarks/core/browser/bookmark_index_unittest.cc',
-            'bookmarks/core/browser/bookmark_model_unittest.cc',
-            'bookmarks/core/browser/bookmark_utils_unittest.cc',
+            'bookmarks/browser/bookmark_codec_unittest.cc',
+            'bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc',
+            'bookmarks/browser/bookmark_index_unittest.cc',
+            'bookmarks/browser/bookmark_model_unittest.cc',
+            'bookmarks/browser/bookmark_utils_unittest.cc',
             'captive_portal/captive_portal_detector_unittest.cc',
             'cloud_devices/common/cloud_devices_urls_unittest.cc',
             'cloud_devices/common/printer_description_unittest.cc',
@@ -212,8 +212,8 @@
             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
 
             # Dependencies of bookmarks
-            'components.gyp:bookmarks_core_browser',
-            'components.gyp:bookmarks_core_test_support',
+            'components.gyp:bookmarks_browser',
+            'components.gyp:bookmarks_test_support',
 
             # Dependencies of captive_portal
             'components.gyp:captive_portal_test_support',
@@ -293,7 +293,7 @@
           'conditions': [
             ['toolkit_views == 1', {
               'sources': [
-                'bookmarks/core/browser/bookmark_node_data_unittest.cc',
+                'bookmarks/browser/bookmark_node_data_unittest.cc',
               ],
             }],
             ['OS != "ios"', {
diff --git a/components/enhanced_bookmarks/DEPS b/components/enhanced_bookmarks/DEPS
index c37b153..34abc99 100644
--- a/components/enhanced_bookmarks/DEPS
+++ b/components/enhanced_bookmarks/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/bookmarks/core",
+  "+components/bookmarks",
   "+sql",
   "+ui",
 ]