Move bookmarks extension api implementation to bookmarks dir.

We're moving all the extension api implementations out of
browser/extensions into the directory with the code they are
automating.

BUG=101244

Review URL: http://codereview.chromium.org/8374023

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

20 files changed, 93 insertions, 91 deletions

diff --git a/chrome/browser/extensions/extension_bookmarks_module.cc b/chrome/browser/bookmarks/bookmark_extension_api.cc
index 19d23f2..0742617 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_api.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 "chrome/browser/extensions/extension_bookmarks_module.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
@@ -18,11 +18,11 @@
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
+#include "chrome/browser/bookmarks/bookmark_extension_helpers.h"
 #include "chrome/browser/bookmarks/bookmark_html_writer.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/extensions/extension_bookmark_helpers.h"
-#include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extensions_quota_service.h"
@@ -38,7 +38,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace keys = extension_bookmarks_module_constants;
+namespace keys = bookmark_extension_api_constants;
 
 using base::TimeDelta;
 typedef QuotaLimitHeuristic::Bucket Bucket;
@@ -125,21 +125,21 @@ void BookmarksFunction::Observe(int type,
   Release();  // Balanced in Run().
 }
 
-ExtensionBookmarkEventRouter::ExtensionBookmarkEventRouter(
+BookmarkExtensionEventRouter::BookmarkExtensionEventRouter(
     BookmarkModel* model) : model_(model) {
 }
 
-ExtensionBookmarkEventRouter::~ExtensionBookmarkEventRouter() {
+BookmarkExtensionEventRouter::~BookmarkExtensionEventRouter() {
   if (model_) {
     model_->RemoveObserver(this);
   }
 }
 
-void ExtensionBookmarkEventRouter::Init() {
+void BookmarkExtensionEventRouter::Init() {
   model_->AddObserver(this);
 }
 
-void ExtensionBookmarkEventRouter::DispatchEvent(Profile *profile,
+void BookmarkExtensionEventRouter::DispatchEvent(Profile *profile,
                                                  const char* event_name,
                                                  const std::string& json_args) {
   if (profile->GetExtensionEventRouter()) {
@@ -148,18 +148,18 @@ void ExtensionBookmarkEventRouter::DispatchEvent(Profile *profile,
   }
 }
 
-void ExtensionBookmarkEventRouter::Loaded(BookmarkModel* model,
+void BookmarkExtensionEventRouter::Loaded(BookmarkModel* model,
                                           bool ids_reassigned) {
   // TODO(erikkay): Perhaps we should send this event down to the extension
   // so they know when it's safe to use the API?
 }
 
-void ExtensionBookmarkEventRouter::BookmarkModelBeingDeleted(
+void BookmarkExtensionEventRouter::BookmarkModelBeingDeleted(
     BookmarkModel* model) {
   model_ = NULL;
 }
 
-void ExtensionBookmarkEventRouter::BookmarkNodeMoved(
+void BookmarkExtensionEventRouter::BookmarkNodeMoved(
     BookmarkModel* model,
     const BookmarkNode* old_parent,
     int old_index,
@@ -182,14 +182,14 @@ void ExtensionBookmarkEventRouter::BookmarkNodeMoved(
   DispatchEvent(model->profile(), keys::kOnBookmarkMoved, json_args);
 }
 
-void ExtensionBookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
+void BookmarkExtensionEventRouter::BookmarkNodeAdded(BookmarkModel* model,
                                                      const BookmarkNode* parent,
                                                      int index) {
   ListValue args;
   const BookmarkNode* node = parent->GetChild(index);
   args.Append(new StringValue(base::Int64ToString(node->id())));
   DictionaryValue* obj =
-      extension_bookmark_helpers::GetNodeDictionary(node, false, false);
+      bookmark_extension_helpers::GetNodeDictionary(node, false, false);
   args.Append(obj);
 
   std::string json_args;
@@ -197,7 +197,7 @@ void ExtensionBookmarkEventRouter::BookmarkNodeAdded(BookmarkModel* model,
   DispatchEvent(model->profile(), keys::kOnBookmarkCreated, json_args);
 }
 
-void ExtensionBookmarkEventRouter::BookmarkNodeRemoved(
+void BookmarkExtensionEventRouter::BookmarkNodeRemoved(
     BookmarkModel* model,
     const BookmarkNode* parent,
     int index,
@@ -215,7 +215,7 @@ void ExtensionBookmarkEventRouter::BookmarkNodeRemoved(
   DispatchEvent(model->profile(), keys::kOnBookmarkRemoved, json_args);
 }
 
-void ExtensionBookmarkEventRouter::BookmarkNodeChanged(
+void BookmarkExtensionEventRouter::BookmarkNodeChanged(
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
   args.Append(new StringValue(base::Int64ToString(node->id())));
@@ -236,12 +236,12 @@ void ExtensionBookmarkEventRouter::BookmarkNodeChanged(
   DispatchEvent(model->profile(), keys::kOnBookmarkChanged, json_args);
 }
 
-void ExtensionBookmarkEventRouter::BookmarkNodeFaviconChanged(
+void BookmarkExtensionEventRouter::BookmarkNodeFaviconChanged(
     BookmarkModel* model, const BookmarkNode* node) {
   // TODO(erikkay) anything we should do here?
 }
 
-void ExtensionBookmarkEventRouter::BookmarkNodeChildrenReordered(
+void BookmarkExtensionEventRouter::BookmarkNodeChildrenReordered(
     BookmarkModel* model, const BookmarkNode* node) {
   ListValue args;
   args.Append(new StringValue(base::Int64ToString(node->id())));
@@ -263,7 +263,7 @@ void ExtensionBookmarkEventRouter::BookmarkNodeChildrenReordered(
                 json_args);
 }
 
-void ExtensionBookmarkEventRouter::
+void BookmarkExtensionEventRouter::
     BookmarkImportBeginning(BookmarkModel* model) {
   ListValue args;
   std::string json_args;
@@ -273,7 +273,7 @@ void ExtensionBookmarkEventRouter::
                 json_args);
 }
 
-void ExtensionBookmarkEventRouter::BookmarkImportEnding(BookmarkModel* model) {
+void BookmarkExtensionEventRouter::BookmarkImportEnding(BookmarkModel* model) {
   ListValue args;
   std::string json_args;
   base::JSONWriter::Write(&args, false, &json_args);
@@ -302,7 +302,7 @@ bool GetBookmarksFunction::RunImpl() {
         error_ = keys::kNoNodeError;
         return false;
       } else {
-        extension_bookmark_helpers::AddNode(node, json.get(), false);
+        bookmark_extension_helpers::AddNode(node, json.get(), false);
       }
     }
   } else {
@@ -316,7 +316,7 @@ bool GetBookmarksFunction::RunImpl() {
       error_ = keys::kNoNodeError;
       return false;
     }
-    extension_bookmark_helpers::AddNode(node, json.get(), false);
+    bookmark_extension_helpers::AddNode(node, json.get(), false);
   }
 
   result_.reset(json.release());
@@ -339,7 +339,7 @@ bool GetBookmarkChildrenFunction::RunImpl() {
   int child_count = node->child_count();
   for (int i = 0; i < child_count; ++i) {
     const BookmarkNode* child = node->GetChild(i);
-    extension_bookmark_helpers::AddNode(child, json.get(), false);
+    bookmark_extension_helpers::AddNode(child, json.get(), false);
   }
 
   result_.reset(json.release());
@@ -359,7 +359,7 @@ bool GetBookmarkRecentFunction::RunImpl() {
   std::vector<const BookmarkNode*>::iterator i = nodes.begin();
   for (; i != nodes.end(); ++i) {
     const BookmarkNode* node = *i;
-    extension_bookmark_helpers::AddNode(node, json, false);
+    bookmark_extension_helpers::AddNode(node, json, false);
   }
   result_.reset(json);
   return true;
@@ -369,7 +369,7 @@ bool GetBookmarkTreeFunction::RunImpl() {
   BookmarkModel* model = profile()->GetBookmarkModel();
   scoped_ptr<ListValue> json(new ListValue());
   const BookmarkNode* node = model->root_node();
-  extension_bookmark_helpers::AddNode(node, json.get(), true);
+  bookmark_extension_helpers::AddNode(node, json.get(), true);
   result_.reset(json.release());
   return true;
 }
@@ -389,7 +389,7 @@ bool GetBookmarkSubTreeFunction::RunImpl() {
     error_ = keys::kNoNodeError;
     return false;
   }
-  extension_bookmark_helpers::AddNode(node, json.get(), true);
+  bookmark_extension_helpers::AddNode(node, json.get(), true);
   result_.reset(json.release());
   return true;
 }
@@ -408,7 +408,7 @@ bool SearchBookmarksFunction::RunImpl() {
   std::vector<const BookmarkNode*>::iterator i = nodes.begin();
   for (; i != nodes.end(); ++i) {
     const BookmarkNode* node = *i;
-    extension_bookmark_helpers::AddNode(node, json, false);
+    bookmark_extension_helpers::AddNode(node, json, false);
   }
 
   result_.reset(json);
@@ -448,7 +448,7 @@ bool RemoveBookmarkFunction::RunImpl() {
   size_t count = ids.size();
   EXTENSION_FUNCTION_VALIDATE(count > 0);
   for (std::list<int64>::iterator it = ids.begin(); it != ids.end(); ++it) {
-    if (!extension_bookmark_helpers::RemoveNode(model, *it, recursive, &error_))
+    if (!bookmark_extension_helpers::RemoveNode(model, *it, recursive, &error_))
       return false;
   }
   return true;
@@ -516,7 +516,7 @@ bool CreateBookmarkFunction::RunImpl() {
   }
 
   DictionaryValue* ret =
-      extension_bookmark_helpers::GetNodeDictionary(node, false, false);
+      bookmark_extension_helpers::GetNodeDictionary(node, false, false);
   result_.reset(ret);
 
   return true;
@@ -595,7 +595,7 @@ bool MoveBookmarkFunction::RunImpl() {
   model->Move(node, parent, index);
 
   DictionaryValue* ret =
-      extension_bookmark_helpers::GetNodeDictionary(node, false, false);
+      bookmark_extension_helpers::GetNodeDictionary(node, false, false);
   result_.reset(ret);
 
   return true;
@@ -653,7 +653,7 @@ bool UpdateBookmarkFunction::RunImpl() {
     model->SetURL(node, url);
 
   DictionaryValue* ret =
-      extension_bookmark_helpers::GetNodeDictionary(node, false, false);
+      bookmark_extension_helpers::GetNodeDictionary(node, false, false);
   result_.reset(ret);
 
   return true;
diff --git a/chrome/browser/extensions/extension_bookmarks_module.h b/chrome/browser/bookmarks/bookmark_extension_api.h
index 9004b31..5ca16b1 100644
--- a/chrome/browser/extensions/extension_bookmarks_module.h
+++ b/chrome/browser/bookmarks/bookmark_extension_api.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_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_H_
 #pragma once
 
 #include <list>
@@ -26,10 +26,10 @@ class ListValue;
 
 // Observes BookmarkModel and then routes the notifications as events to
 // the extension system.
-class ExtensionBookmarkEventRouter : public BookmarkModelObserver {
+class BookmarkExtensionEventRouter : public BookmarkModelObserver {
  public:
-  explicit ExtensionBookmarkEventRouter(BookmarkModel* model);
-  virtual ~ExtensionBookmarkEventRouter();
+  explicit BookmarkExtensionEventRouter(BookmarkModel* model);
+  virtual ~BookmarkExtensionEventRouter();
 
   void Init();
 
@@ -65,7 +65,7 @@ class ExtensionBookmarkEventRouter : public BookmarkModelObserver {
 
   BookmarkModel* model_;
 
-  DISALLOW_COPY_AND_ASSIGN(ExtensionBookmarkEventRouter);
+  DISALLOW_COPY_AND_ASSIGN(BookmarkExtensionEventRouter);
 };
 
 class BookmarksFunction : public AsyncExtensionFunction,
@@ -241,4 +241,4 @@ class ExportBookmarksFunction : public BookmarksIOFunction {
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.export");
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_H_
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_H_
diff --git a/chrome/browser/extensions/extension_bookmarks_module_constants.cc b/chrome/browser/bookmarks/bookmark_extension_api_constants.cc
index 3b13942..9c9c762 100644
--- a/chrome/browser/extensions/extension_bookmarks_module_constants.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_api_constants.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/extensions/extension_bookmarks_module_constants.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 
-namespace extension_bookmarks_module_constants {
+namespace bookmark_extension_api_constants {
 
 const char kIdKey[] = "id";
 const char kIndexKey[] = "index";
@@ -46,4 +46,5 @@ const char kOnBookmarkDragLeave[] =
     "experimental.bookmarkManager.onDragLeave";
 const char kOnBookmarkDrop[] =
     "experimental.bookmarkManager.onDrop";
-}  // namespace extension_bookmarks_module_constants
+
+}  // namespace bookmark_extension_api_constants
diff --git a/chrome/browser/extensions/extension_bookmarks_module_constants.h b/chrome/browser/bookmarks/bookmark_extension_api_constants.h
index d20b1220..cd5b113 100644
--- a/chrome/browser/extensions/extension_bookmarks_module_constants.h
+++ b/chrome/browser/bookmarks/bookmark_extension_api_constants.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 // Constants used to for the Bookmarks API.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_CONSTANTS_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_CONSTANTS_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_CONSTANTS_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_CONSTANTS_H_
 #pragma once
 
-namespace extension_bookmarks_module_constants {
+namespace bookmark_extension_api_constants {
 
 // Keys.
 extern const char kIdKey[];
@@ -50,6 +50,6 @@ extern const char kOnBookmarkDragEnter[];
 extern const char kOnBookmarkDragLeave[];
 extern const char kOnBookmarkDrop[];
 
-};  // namespace extension_bookmarks_module_constants
+};  // namespace bookmark_extension_api_constants
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARKS_MODULE_CONSTANTS_H_
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_API_CONSTANTS_H_
diff --git a/chrome/browser/extensions/extension_bookmarks_apitest.cc b/chrome/browser/bookmarks/bookmark_extension_apitest.cc
index 89cd41b..68a025b 100644
--- a/chrome/browser/extensions/extension_bookmarks_apitest.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_apitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/bookmarks/bookmark_extension_helpers.cc
index d02ae9f..a9873be 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_helpers.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 "chrome/browser/extensions/extension_bookmark_helpers.h"
+#include "chrome/browser/bookmarks/bookmark_extension_helpers.h"
 
 #include "base/string_number_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
 
-namespace keys = extension_bookmarks_module_constants;
+namespace keys = bookmark_extension_api_constants;
 
 namespace {
 
@@ -18,7 +18,7 @@ void AddNode(const BookmarkNode* node,
              bool recurse,
              bool only_folders) {
   if (node->IsVisible()) {
-    base::DictionaryValue* dict = extension_bookmark_helpers::GetNodeDictionary(
+    base::DictionaryValue* dict = bookmark_extension_helpers::GetNodeDictionary(
         node, recurse, only_folders);
     list->Append(dict);
   }
@@ -26,7 +26,7 @@ void AddNode(const BookmarkNode* node,
 
 }  // namespace
 
-namespace extension_bookmark_helpers {
+namespace bookmark_extension_helpers {
 
 base::DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
                                          bool recurse,
@@ -104,4 +104,4 @@ bool RemoveNode(BookmarkModel* model,
   return true;
 }
 
-}  // namespace extension_bookmark_helpers
+}  // namespace bookmark_extension_helpers
diff --git a/chrome/browser/extensions/extension_bookmark_helpers.h b/chrome/browser/bookmarks/bookmark_extension_helpers.h
index beb7600..ff16c0a 100644
--- a/chrome/browser/extensions/extension_bookmark_helpers.h
+++ b/chrome/browser/bookmarks/bookmark_extension_helpers.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_HELPERS_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_HELPERS_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_HELPERS_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_HELPERS_H_
 #pragma once
 
 #include <string>
@@ -19,7 +19,7 @@ class ListValue;
 }
 
 // Helper functions.
-namespace extension_bookmark_helpers {
+namespace bookmark_extension_helpers {
 
 base::DictionaryValue* GetNodeDictionary(const BookmarkNode* node,
                                          bool recurse,
@@ -37,6 +37,6 @@ bool RemoveNode(BookmarkModel* model,
                 bool recursive,
                 std::string* error);
 
-}  // namespace extension_bookmark_helpers
+}  // namespace bookmark_extension_helpers
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_HELPERS_H_
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_EXTENSION_HELPERS_H_
diff --git a/chrome/browser/extensions/extension_bookmarks_unittest.cc b/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
index 3ff5dc8..5d03859 100644
--- a/chrome/browser/extensions/extension_bookmarks_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_extension_helpers_unittest.cc
@@ -7,10 +7,10 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/extensions/extension_bookmark_helpers.h"
-#include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
+#include "chrome/browser/bookmarks/bookmark_extension_helpers.h"
 
-namespace keys = extension_bookmarks_module_constants;
+namespace keys = bookmark_extension_api_constants;
 
 class ExtensionBookmarksTest : public testing::Test {
  public:
@@ -32,7 +32,7 @@ class ExtensionBookmarksTest : public testing::Test {
   const BookmarkNode* folder;
 };
 TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
-  DictionaryValue* tree = extension_bookmark_helpers::GetNodeDictionary(
+  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
       model_->other_node(),
       true,    // Recurse.
       false);  // Not only folders.
@@ -42,7 +42,7 @@ TEST_F(ExtensionBookmarksTest, GetFullTreeFromRoot) {
 }
 
 TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
-  DictionaryValue* tree = extension_bookmark_helpers::GetNodeDictionary(
+  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
       model_->other_node(),
       true,   // Recurse.
       true);  // Only folders.
@@ -52,7 +52,7 @@ TEST_F(ExtensionBookmarksTest, GetFoldersOnlyFromRoot) {
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtree) {
-  DictionaryValue* tree = extension_bookmark_helpers::GetNodeDictionary(
+  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
       folder,
       true,    // Recurse.
       false);  // Not only folders.
@@ -67,7 +67,7 @@ TEST_F(ExtensionBookmarksTest, GetSubtree) {
 }
 
 TEST_F(ExtensionBookmarksTest, GetSubtreeFoldersOnly) {
-  DictionaryValue* tree = extension_bookmark_helpers::GetNodeDictionary(
+  DictionaryValue* tree = bookmark_extension_helpers::GetNodeDictionary(
       folder,
       true,   // Recurse.
       true);  // Only folders.
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/bookmarks/bookmark_manager_extension_api.cc
index 8fb6e80..bfbbb73 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.cc
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.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 "chrome/browser/extensions/extension_bookmark_manager_api.h"
+#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 
 #include <vector>
 
@@ -12,8 +12,8 @@
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
-#include "chrome/browser/extensions/extension_bookmark_helpers.h"
-#include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
+#include "chrome/browser/bookmarks/bookmark_extension_helpers.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_web_ui.h"
@@ -28,7 +28,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace keys = extension_bookmarks_module_constants;
+namespace keys = bookmark_extension_api_constants;
 
 namespace {
 
@@ -465,11 +465,11 @@ bool GetSubtreeBookmarkManagerFunction::RunImpl() {
   }
   scoped_ptr<ListValue> json(new ListValue());
   if (folders_only) {
-    extension_bookmark_helpers::AddNodeFoldersOnly(node,
+    bookmark_extension_helpers::AddNodeFoldersOnly(node,
                                                    json.get(),
                                                    true);
   } else {
-    extension_bookmark_helpers::AddNode(node, json.get(), true);
+    bookmark_extension_helpers::AddNode(node, json.get(), true);
   }
   result_.reset(json.release());
   return true;
diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.h b/chrome/browser/bookmarks/bookmark_manager_extension_api.h
index f17b815..a3e4aed 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_api.h
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.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 CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_MANAGER_API_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_MANAGER_API_H_
+#ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_
+#define CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_
 #pragma once
 
+#include "chrome/browser/bookmarks/bookmark_extension_api.h"
 #include "chrome/browser/bookmarks/bookmark_node_data.h"
-#include "chrome/browser/extensions/extension_bookmarks_module.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 
@@ -20,6 +20,7 @@ class ListValue;
 }
 
 // Class that handles the chrome.experimental.bookmarkManager events.
+// TODO(aa): Rename this
 class ExtensionBookmarkManagerEventRouter
     : public BookmarkTabHelper::BookmarkDrag {
  public:
@@ -146,4 +147,4 @@ class RecordLaunchBookmarkFunction : public BookmarksFunction {
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.bookmarkManager.recordLaunch")
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_BOOKMARK_MANAGER_API_H_
+#endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_MANAGER_EXTENSION_API_H_
diff --git a/chrome/browser/extensions/extension_bookmark_manager_apitest.cc b/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc
index 64693b5..ec16902 100644
--- a/chrome/browser/extensions/extension_bookmark_manager_apitest.cc
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_apitest.cc
@@ -4,9 +4,9 @@
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/extensions/extension_apitest.h"
-#include "chrome/browser/extensions/extension_bookmark_manager_api.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
diff --git a/chrome/browser/extensions/extension_function_dispatcher.cc b/chrome/browser/extensions/extension_function_dispatcher.cc
index 8144a7e..fe705c3 100644
--- a/chrome/browser/extensions/extension_function_dispatcher.cc
+++ b/chrome/browser/extensions/extension_function_dispatcher.cc
@@ -11,11 +11,11 @@
 #include "base/process_util.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api.h"
+#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/extensions/execute_code_in_tab_function.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/extensions/extension_app_api.h"
-#include "chrome/browser/extensions/extension_bookmark_manager_api.h"
-#include "chrome/browser/extensions/extension_bookmarks_module.h"
 #include "chrome/browser/extensions/extension_browser_actions_api.h"
 #include "chrome/browser/extensions/extension_clear_api.h"
 #include "chrome/browser/extensions/extension_clipboard_api.h"
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index dc5c029..6532f07 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -27,6 +27,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/extensions/app_notification_manager.h"
@@ -34,7 +35,6 @@
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
-#include "chrome/browser/extensions/extension_bookmarks_module.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_cookies_api.h"
 #include "chrome/browser/extensions/extension_data_deleter.h"
@@ -717,7 +717,7 @@ void ExtensionService::InitEventRouters() {
   browser_event_router_.reset(new ExtensionBrowserEventRouter(profile_));
   browser_event_router_->Init();
   preference_event_router_.reset(new ExtensionPreferenceEventRouter(profile_));
-  bookmark_event_router_.reset(new ExtensionBookmarkEventRouter(
+  bookmark_event_router_.reset(new BookmarkExtensionEventRouter(
       profile_->GetBookmarkModel()));
   bookmark_event_router_->Init();
   cookies_event_router_.reset(new ExtensionCookiesEventRouter(profile_));
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index 79fe477..b42e895 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -46,8 +46,8 @@
 #include "content/public/browser/notification_registrar.h"
 
 class AppNotificationManager;
+class BookmarkExtensionEventRouter;
 class CrxInstaller;
-class ExtensionBookmarkEventRouter;
 class ExtensionBrowserEventRouter;
 class ExtensionContentSettingsStore;
 class ExtensionCookiesEventRouter;
@@ -811,7 +811,7 @@ class ExtensionService
 
   scoped_ptr<ExtensionPreferenceEventRouter> preference_event_router_;
 
-  scoped_ptr<ExtensionBookmarkEventRouter> bookmark_event_router_;
+  scoped_ptr<BookmarkExtensionEventRouter> bookmark_event_router_;
 
   scoped_ptr<ExtensionCookiesEventRouter> cookies_event_router_;
 
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index 3bde358..126e12b 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -9,7 +9,7 @@
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/extensions/extension_bookmark_manager_api.h"
+#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/extensions/extension_web_ui.h b/chrome/browser/extensions/extension_web_ui.h
index 046a126..f16f807 100644
--- a/chrome/browser/extensions/extension_web_ui.h
+++ b/chrome/browser/extensions/extension_web_ui.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/extensions/extension_bookmark_manager_api.h"
+#include "chrome/browser/bookmarks/bookmark_manager_extension_api.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/ui/webui/chrome_web_ui.h"
 #include "chrome/common/extensions/extension.h"
diff --git a/chrome/browser/sync/util/DEPS b/chrome/browser/sync/util/DEPS
index c458ad8..d852de5 100644
--- a/chrome/browser/sync/util/DEPS
+++ b/chrome/browser/sync/util/DEPS
@@ -13,7 +13,7 @@ include_rules = [
   "+chrome/browser/password_manager/encryptor.h",
 
   # ExtensionsActivityMonitor
-  "+chrome/browser/extensions",
+  "+chrome/browser/bookmarks/bookmark_extension_api.h",
   "+chrome/common/extensions",
   "+chrome/common/chrome_notification_types.h",
 
diff --git a/chrome/browser/sync/util/extensions_activity_monitor.cc b/chrome/browser/sync/util/extensions_activity_monitor.cc
index 66b0fbb..891ecea 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/sync/util/extensions_activity_monitor.h"
 
 #include "base/task.h"
-#include "chrome/browser/extensions/extension_bookmarks_module.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/browser_thread.h"
diff --git a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
index 5e2283b..c7c3970 100644
--- a/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
+++ b/chrome/browser/sync/util/extensions_activity_monitor_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_bookmarks_module.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
diff --git a/chrome/browser/ui/webui/ntp/bookmarks_handler.cc b/chrome/browser/ui/webui/ntp/bookmarks_handler.cc
index aa928eda..e36859b 100644
--- a/chrome/browser/ui/webui/ntp/bookmarks_handler.cc
+++ b/chrome/browser/ui/webui/ntp/bookmarks_handler.cc
@@ -9,8 +9,8 @@
 #include "base/bind_helpers.h"
 #include "base/string_number_conversions.h"
 #include "base/values.h"
+#include "chrome/browser/bookmarks/bookmark_extension_api_constants.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/extensions/extension_bookmarks_module_constants.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ -24,7 +24,7 @@
 // NTP into an embedded extension which would allow us to leverage the same
 // bookmark APIs as the bookmark manager.
 
-namespace keys = extension_bookmarks_module_constants;
+namespace keys = bookmark_extension_api_constants;
 
 BookmarksHandler::BookmarksHandler() : model_(NULL),
                                        dom_ready_(false),