38 files changed, 72 insertions, 75 deletions

diff --git a/chrome/SConscript.unit_tests b/chrome/SConscript.unit_tests
index 33b5ef2..b87ff13 100644
--- a/chrome/SConscript.unit_tests
+++ b/chrome/SConscript.unit_tests
@@ -108,8 +108,8 @@ unit_test_files = [
     'browser/autocomplete/keyword_provider_unittest.cc',
     'browser/back_forward_menu_model_unittest.cc',
     'browser/bookmark_bar_context_menu_controller_test.cc',
-    'browser/bookmark_bar_model_unittest.cc',
-    'browser/bookmark_drag_data_unittest.cc',
+    'browser/bookmarks/bookmark_bar_model_unittest.cc',
+    'browser/bookmarks/bookmark_drag_data_unittest.cc',
     'browser/cache_manager_host_unittest.cc',
     'browser/chrome_thread_unittest.cc',
     'browser/controller_unittest.cc',
diff --git a/chrome/browser/SConscript b/chrome/browser/SConscript
index 0ac9440..73d25c1 100644
--- a/chrome/browser/SConscript
+++ b/chrome/browser/SConscript
@@ -74,10 +74,10 @@ input_files = [
     'back_forward_menu_model.cc',
     'base_history_model.cc',
     'bookmark_bar_context_menu_controller.cc',
-    'bookmark_bar_model.cc',
-    'bookmark_codec.cc',
-    'bookmark_storage.cc',
-    'bookmark_drag_data.cc',
+    'bookmarks/bookmark_bar_model.cc',
+    'bookmarks/bookmark_codec.cc',
+    'bookmarks/bookmark_storage.cc',
+    'bookmarks/bookmark_drag_data.cc',
     'browser.cc',
     'browser_about_handler.cc',
     'browser_commands.cc',
diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc
index c51510b..6e7dc97 100644
--- a/chrome/browser/autocomplete/autocomplete.cc
+++ b/chrome/browser/autocomplete/autocomplete.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/autocomplete/history_contents_provider.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/external_protocol_handler.h"
-#include "chrome/browser/bookmark_bar_model.h"
 #include "chrome/browser/history_tab_ui.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/url_fixer_upper.h"
diff --git a/chrome/browser/autocomplete/history_contents_provider.h b/chrome/browser/autocomplete/history_contents_provider.h
index b2451ee..aded64d 100644
--- a/chrome/browser/autocomplete/history_contents_provider.h
+++ b/chrome/browser/autocomplete/history_contents_provider.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_AUTOCOMPLETE_HISTORY_CONTENTS_PROVIDER_H__
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/history/history.h"
 
 // HistoryContentsProvider is an AutocompleteProvider that provides results from
diff --git a/chrome/browser/autocomplete/history_url_provider_unittest.cc b/chrome/browser/autocomplete/history_url_provider_unittest.cc
index 6dd80e9..e1b8ee8 100644
--- a/chrome/browser/autocomplete/history_url_provider_unittest.cc
+++ b/chrome/browser/autocomplete/history_url_provider_unittest.cc
@@ -6,7 +6,7 @@
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 9126a35..857f322 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -6,7 +6,7 @@
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_util.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/bookmark_bar_context_menu_controller.cc b/chrome/browser/bookmark_bar_context_menu_controller.cc
index ae8eaa7e..a21c130 100644
--- a/chrome/browser/bookmark_bar_context_menu_controller.cc
+++ b/chrome/browser/bookmark_bar_context_menu_controller.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/bookmark_bar_context_menu_controller.h"
 
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/page_navigator.h"
diff --git a/chrome/browser/bookmark_bar_context_menu_controller_test.cc b/chrome/browser/bookmark_bar_context_menu_controller_test.cc
index cff995d..081e1f4 100644
--- a/chrome/browser/bookmark_bar_context_menu_controller_test.cc
+++ b/chrome/browser/bookmark_bar_context_menu_controller_test.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmark_bar_context_menu_controller.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/bookmark_bar_model.cc b/chrome/browser/bookmarks/bookmark_bar_model.cc
index 07e2acd..df35fe5 100644
--- a/chrome/browser/bookmark_bar_model.cc
+++ b/chrome/browser/bookmarks/bookmark_bar_model.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 "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 
 #include "base/gfx/png_decoder.h"
+#include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/profile.h"
-#include "chrome/browser/bookmark_storage.h"
 #include "chrome/common/scoped_vector.h"
 
 #include "generated_resources.h"
diff --git a/chrome/browser/bookmark_bar_model.h b/chrome/browser/bookmarks/bookmark_bar_model.h
index 0bcbdf0..25c19ad 100644
--- a/chrome/browser/bookmark_bar_model.h
+++ b/chrome/browser/bookmarks/bookmark_bar_model.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 CHROME_BROWSER_BOOKMARK_BAR_MODEL_H_
-#define CHROME_BROWSER_BOOKMARK_BAR_MODEL_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
 
 #include "base/lock.h"
 #include "base/observer_list.h"
 #include "base/scoped_handle.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
-#include "chrome/browser/bookmark_storage.h"
+#include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/cancelable_request.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_types.h"
@@ -429,8 +429,7 @@ class BookmarkBarModel : public NotificationObserver, public BookmarkService {
   // Handle to event signaled when loading is done.
   ScopedHandle loaded_signal_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(BookmarkBarModel);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkBarModel);
 };
 
-#endif  // CHROME_BROWSER_BOOKMARK_BAR_MODEL_H_
-
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_BAR_MODEL_H_
diff --git a/chrome/browser/bookmark_bar_model_unittest.cc b/chrome/browser/bookmarks/bookmark_bar_model_unittest.cc
index e08c8ff..f6d4b2d 100644
--- a/chrome/browser/bookmark_bar_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_bar_model_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/string_util.h"
-#include "chrome/browser/bookmark_codec.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/testing_profile.h"
diff --git a/chrome/browser/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc
index 14d8851..93874f3 100644
--- a/chrome/browser/bookmark_codec.cc
+++ b/chrome/browser/bookmarks/bookmark_codec.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_codec.h"
 
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "googleurl/src/gurl.h"
 
 #include "generated_resources.h"
diff --git a/chrome/browser/bookmark_codec.h b/chrome/browser/bookmarks/bookmark_codec.h
index 673190f..1470f2c 100644
--- a/chrome/browser/bookmark_codec.h
+++ b/chrome/browser/bookmarks/bookmark_codec.h
@@ -6,7 +6,8 @@
 // into JSON values. The encoded values are written to disk via the
 // BookmarkService.
 
-#ifndef CHROME_BROWSER_BOOKMARK_CODEC_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_
 
 #include "base/basictypes.h"
 
@@ -63,5 +64,4 @@ class BookmarkCodec {
   DISALLOW_COPY_AND_ASSIGN(BookmarkCodec);
 };
 
-#endif  // CHROME_BROWSER_BOOKMARK_CODEC_H_
-
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_CODEC_H_
diff --git a/chrome/browser/bookmark_drag_data.cc b/chrome/browser/bookmarks/bookmark_drag_data.cc
index 0c9a0fa..61c9ccc 100644
--- a/chrome/browser/bookmark_drag_data.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data.cc
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/bookmarks/bookmark_drag_data.h"
+
 #include "base/pickle.h"
-#include "chrome/browser/bookmark_bar_model.h"
-#include "chrome/browser/bookmark_drag_data.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/common/os_exchange_data.h"
 
 static CLIPFORMAT clipboard_format = 0;
diff --git a/chrome/browser/bookmark_drag_data.h b/chrome/browser/bookmarks/bookmark_drag_data.h
index 04d752e..fd967eb 100644
--- a/chrome/browser/bookmark_drag_data.h
+++ b/chrome/browser/bookmarks/bookmark_drag_data.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 CHROME_BROWSER_BOOKMARK_DRAG_DATA_
-#define CHROME_BROWSER_BOOKMARK_DRAG_DATA_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_
 
 #include <vector>
 
@@ -78,5 +78,4 @@ struct BookmarkDragData {
   int id_;
 };
 
-#endif  // CHROME_BROWSER_BOOKMARK_DRAG_DATA_
-
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_DRAG_DATA_
diff --git a/chrome/browser/bookmark_drag_data_unittest.cc b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
index d27bc55..4ebe7b0 100644
--- a/chrome/browser/bookmark_drag_data_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_drag_data_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/bookmark_drag_data.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/common/os_exchange_data.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -118,4 +118,3 @@ TEST_F(BookmarkDragDataTest, GroupWithChild) {
   BookmarkBarNode* r_group = read_data.GetNode(&model);
   EXPECT_TRUE(group == r_group);
 }
-
diff --git a/chrome/browser/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index 32bda99..712b573 100644
--- a/chrome/browser/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -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 "chrome/browser/bookmark_storage.h"
+#include "chrome/browser/bookmarks/bookmark_storage.h"
 
 #include "base/file_util.h"
 #include "base/json_writer.h"
 #include "base/message_loop.h"
-#include "chrome/browser/bookmark_bar_model.h"
-#include "chrome/browser/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/profile.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/json_value_serializer.h"
diff --git a/chrome/browser/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index 137ccb4..cf2c3a9 100644
--- a/chrome/browser/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.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 CHROME_BROWSER_BOOKMARK_STORAGE_H_

-#define CHROME_BROWSER_BOOKMARK_STORAGE_H_

+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_

+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_

 

 #include "base/ref_counted.h"

 #include "base/task.h"

@@ -91,8 +91,7 @@ class BookmarkStorageBackend :
   // Path bookmarks are read from if asked to load from history file.

   const std::wstring tmp_history_path_;

 

-  DISALLOW_EVIL_CONSTRUCTORS(BookmarkStorageBackend);

+  DISALLOW_COPY_AND_ASSIGN(BookmarkStorageBackend);

 };

 

-#endif  // CHROME_BROWSER_BOOKMARK_STORAGE_H_

-

+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_STORAGE_H_

diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index 5a76452..35cc2ce 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -799,7 +799,7 @@
 			</File>
 		</Filter>
 		<Filter
-			Name="Bookmark Bar"
+			Name="Bookmarks"
 			>
 			<File
 				RelativePath=".\bookmark_bar_context_menu_controller.cc"
@@ -810,27 +810,27 @@
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_bar_model.cc"
+				RelativePath=".\bookmarks\bookmark_bar_model.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_bar_model.h"
+				RelativePath=".\bookmarks\bookmark_bar_model.h"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_codec.cc"
+				RelativePath=".\bookmarks\bookmark_codec.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_codec.h"
+				RelativePath=".\bookmarks\bookmark_codec.h"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_drag_data.cc"
+				RelativePath=".\bookmarks\bookmark_drag_data.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_drag_data.h"
+				RelativePath=".\bookmarks\bookmark_drag_data.h"
 				>
 			</File>
 			<File
@@ -838,11 +838,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_storage.cc"
+				RelativePath=".\bookmarks\bookmark_storage.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\bookmark_storage.h"
+				RelativePath=".\bookmarks\bookmark_storage.h"
 				>
 			</File>
 		</Filter>
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h
index d43021a..49dcf81 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H__
 #define CHROME_BROWSER_DOM_UI_NEW_TAB_UI_H__
 
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/dom_ui/dom_ui_host.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/history/history.h"
diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc
index 05c382a..daaf43b 100644
--- a/chrome/browser/history/expire_history_backend_unittest.cc
+++ b/chrome/browser/history/expire_history_backend_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc
index 4067440..5f91019 100644
--- a/chrome/browser/history/history_backend_unittest.cc
+++ b/chrome/browser/history/history_backend_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/in_memory_database.h"
diff --git a/chrome/browser/history/starred_url_database.cc b/chrome/browser/history/starred_url_database.cc
index 0f860a5..6b61f31 100644
--- a/chrome/browser/history/starred_url_database.cc
+++ b/chrome/browser/history/starred_url_database.cc
@@ -7,8 +7,8 @@
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/json_writer.h"
-#include "chrome/browser/bookmark_bar_model.h"
-#include "chrome/browser/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/query_parser.h"
 #include "chrome/browser/meta_table_helper.h"
diff --git a/chrome/browser/history_model.cc b/chrome/browser/history_model.cc
index 23d3456..64baf0c 100644
--- a/chrome/browser/history_model.cc
+++ b/chrome/browser/history_model.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/history_model.h"
 
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/profile.h"
 
 // The max number of results to retrieve when browsing user's history.
diff --git a/chrome/browser/ie_importer.cc b/chrome/browser/ie_importer.cc
index 1ee7c7f..a65600c 100644
--- a/chrome/browser/ie_importer.cc
+++ b/chrome/browser/ie_importer.cc
@@ -15,7 +15,7 @@
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/win_util.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/ie7_password.h"
 #include "chrome/browser/template_url_model.h"
 #include "chrome/common/l10n_util.h"
diff --git a/chrome/browser/importer.cc b/chrome/browser/importer.cc
index f0dbb74..1fc4ae5 100644
--- a/chrome/browser/importer.cc
+++ b/chrome/browser/importer.cc
@@ -10,7 +10,7 @@
 #include "base/gfx/image_operations.h"
 #include "base/gfx/png_encoder.h"
 #include "base/string_util.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/firefox2_importer.h"
 #include "chrome/browser/firefox3_importer.h"
diff --git a/chrome/browser/importer.h b/chrome/browser/importer.h
index 927a017..598e39e 100644
--- a/chrome/browser/importer.h
+++ b/chrome/browser/importer.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/ie7_password.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/metrics_service.cc b/chrome/browser/metrics_service.cc
index 74e3d7b..aaec563 100644
--- a/chrome/browser/metrics_service.cc
+++ b/chrome/browser/metrics_service.cc
@@ -162,7 +162,7 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/task.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index 3ceef3a..1ca28fe 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -11,7 +11,7 @@
 #include "base/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/values.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download_manager.h"
diff --git a/chrome/browser/views/bookmark_bar_view.h b/chrome/browser/views/bookmark_bar_view.h
index d9bd48b..63dcacb 100644
--- a/chrome/browser/views/bookmark_bar_view.h
+++ b/chrome/browser/views/bookmark_bar_view.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_BOOKMARK_BAR_VIEW_H_
 
-#include "chrome/browser/bookmark_bar_model.h"
-#include "chrome/browser/bookmark_drag_data.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_drag_data.h"
 #include "chrome/common/slide_animation.h"
 #include "chrome/views/label.h"
 #include "chrome/views/menu.h"
diff --git a/chrome/browser/views/bookmark_bar_view_test.cc b/chrome/browser/views/bookmark_bar_view_test.cc
index ca24a3b..ffaa992 100644
--- a/chrome/browser/views/bookmark_bar_view_test.cc
+++ b/chrome/browser/views/bookmark_bar_view_test.cc
@@ -4,7 +4,7 @@
 
 #include "base/string_util.h"
 #include "chrome/browser/automation/ui_controls.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/page_navigator.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 0f56f65..1734d01 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/standard_layout.h"
 #include "chrome/browser/user_metrics.h"
diff --git a/chrome/browser/views/bookmark_editor_view.h b/chrome/browser/views/bookmark_editor_view.h
index 4284ee6..01158ef 100644
--- a/chrome/browser/views/bookmark_editor_view.h
+++ b/chrome/browser/views/bookmark_editor_view.h
@@ -8,7 +8,7 @@
 #include <set>
 
 #include "chrome/views/tree_node_model.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/views/checkbox.h"
 #include "chrome/views/dialog_delegate.h"
 #include "chrome/views/menu.h"
diff --git a/chrome/browser/views/bookmark_editor_view_unittest.cc b/chrome/browser/views/bookmark_editor_view_unittest.cc
index 7838113..2f161a0 100644
--- a/chrome/browser/views/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/views/bookmark_editor_view_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/string_util.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/views/bookmark_editor_view.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/views/toolbar_star_toggle.cc b/chrome/browser/views/toolbar_star_toggle.cc
index dae2728..52d2839 100644
--- a/chrome/browser/views/toolbar_star_toggle.cc
+++ b/chrome/browser/views/toolbar_star_toggle.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/views/toolbar_star_toggle.h"
 
 #include "chrome/app/theme/theme_resources.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/views/bookmark_bubble_view.h"
 #include "chrome/browser/views/toolbar_view.h"
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc
index 971444d..de0a221 100644
--- a/chrome/browser/web_contents.cc
+++ b/chrome/browser/web_contents.cc
@@ -7,7 +7,7 @@
 #include "base/command_line.h"
 #include "base/file_version_info.h"
 #include "chrome/app/locales/locale_settings.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cache_manager_host.h"
 #include "chrome/browser/character_encoding.h"
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index e33a423..8422934 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -8,7 +8,7 @@
 #include "base/base_paths.h"
 #include "base/path_service.h"
 #include "base/file_util.h"
-#include "chrome/browser/bookmark_bar_model.h"
+#include "chrome/browser/bookmarks/bookmark_bar_model.h"
 #include "chrome/browser/browser_prefs.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index fee3966..ea425b9 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -558,7 +558,7 @@
 			Name="TestBookmarkDragData"
 			>
 			<File
-				RelativePath="..\..\browser\bookmark_drag_data_unittest.cc"
+				RelativePath="..\..\browser\bookmarks\bookmark_drag_data_unittest.cc"
 				>
 			</File>
 		</Filter>
@@ -614,7 +614,7 @@
 			Name="TestBookmarkBarModel"
 			>
 			<File
-				RelativePath="..\..\browser\bookmark_bar_model_unittest.cc"
+				RelativePath="..\..\browser\bookmarks\bookmark_bar_model_unittest.cc"
 				>
 			</File>
 		</Filter>