Moving the tabs_module API into a separate directory in api/

Also, splitting extension_tab_modules_constants namespace into
extensions::tab_modules_constants.


BUG=101244
TEST=N/A, only moving code, no change in functionality
TBR=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10544023

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

27 files changed, 61 insertions, 60 deletions

diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc
index 39de504..dcac721 100644
--- a/chrome/browser/accessibility/accessibility_extension_api.cc
+++ b/chrome/browser/accessibility/accessibility_extension_api.cc
@@ -8,8 +8,8 @@
 #include "base/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility/accessibility_extension_api_constants.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
@@ -202,7 +202,7 @@ bool GetAlertsForTabFunction::RunImpl() {
   if (!ExtensionTabUtil::GetTabById(tab_id, profile(), include_incognito(),
                                     NULL, &tab_strip, &contents, &tab_index)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        extension_tabs_module_constants::kTabNotFoundError,
+        extensions::tabs_constants::kTabNotFoundError,
         base::IntToString(tab_id));
     return false;
   }
diff --git a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
index 4b9b22f..ffc8797 100644
--- a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
+++ b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc
@@ -16,13 +16,13 @@
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -49,7 +49,7 @@ using content::WebContents;
 using WebKit::WebInputEvent;
 
 namespace keys = extensions::offscreen_tabs_constants;
-namespace tabs_keys = extension_tabs_module_constants;
+namespace tabs_keys = extensions::tabs_constants;
 namespace events = extension_event_names;
 
 namespace {
diff --git a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h
index 4b4e5b1..85d9d56d 100644
--- a/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h
+++ b/chrome/browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/values.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_function.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
diff --git a/chrome/browser/extensions/execute_code_in_tab_function.cc b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
index 1e6f92d..d2e7dbc 100644
--- a/chrome/browser/extensions/execute_code_in_tab_function.cc
+++ b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.cc
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/execute_code_in_tab_function.h"
+#include "chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/file_reader.h"
 #include "chrome/browser/extensions/script_executor.h"
 #include "chrome/browser/profiles/profile.h"
@@ -31,7 +31,7 @@
 using content::BrowserThread;
 using extensions::ScriptExecutor;
 
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 
 ExecuteCodeInTabFunction::ExecuteCodeInTabFunction()
     : execute_tab_id_(-1),
diff --git a/chrome/browser/extensions/execute_code_in_tab_function.h b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h
index d024364..5c97e3e 100644
--- a/chrome/browser/extensions/execute_code_in_tab_function.h
+++ b/chrome/browser/extensions/api/tabs/execute_code_in_tab_function.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_EXECUTE_CODE_IN_TAB_FUNCTION_H__
-#define CHROME_BROWSER_EXTENSIONS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
+#ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
+#define CHROME_BROWSER_EXTENSIONS_API_TABS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
 #pragma once
 
 #include <string>
@@ -77,4 +77,4 @@ class TabsInsertCSSFunction : public ExecuteCodeInTabFunction {
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.insertCSS")
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
+#endif  // CHROME_BROWSER_EXTENSIONS_API_TABS_EXECUTE_CODE_IN_TAB_FUNCTION_H__
diff --git a/chrome/browser/extensions/extension_tabs_module.cc b/chrome/browser/extensions/api/tabs/tabs.cc
index dc4f2da..96c9413 100644
--- a/chrome/browser/extensions/extension_tabs_module.cc
+++ b/chrome/browser/extensions/api/tabs/tabs.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_tabs_module.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 
 #include <algorithm>
 #include <limits>
@@ -19,13 +19,13 @@
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_function_util.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
 #include "chrome/browser/extensions/extension_window_list.h"
 #include "chrome/browser/extensions/script_executor.h"
@@ -86,7 +86,7 @@ namespace GetAll = extensions::api::windows::GetAll;
 namespace GetCurrent = extensions::api::windows::GetCurrent;
 namespace GetLastFocused = extensions::api::windows::GetLastFocused;
 namespace errors = extension_manifest_errors;
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 
 using content::NavigationController;
 using content::NavigationEntry;
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/api/tabs/tabs.h
index 40934cc..fab0124 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/api/tabs/tabs.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_TABS_MODULE_H__
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__
+#ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_H__
+#define CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_H__
 #pragma once
 
 #include <string>
@@ -198,4 +198,4 @@ class CaptureVisibleTabFunction : public AsyncExtensionFunction,
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.captureVisibleTab")
 };
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_H__
+#endif  // CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_H__
diff --git a/chrome/browser/extensions/extension_tabs_module_constants.cc b/chrome/browser/extensions/api/tabs/tabs_constants.cc
index 2b71b5a..2d81e8f 100644
--- a/chrome/browser/extensions/extension_tabs_module_constants.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_constants.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/extensions/extension_tabs_module_constants.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 
-namespace extension_tabs_module_constants {
+namespace extensions {
+namespace tabs_constants {
 
 const char kActiveKey[] = "active";
 const char kAllFramesKey[] = "allFrames";
@@ -103,4 +104,5 @@ const char kLoadFileError[] = "Failed to load file: \"*\". ";
 const char kCannotDetermineLanguageOfUnloadedTab[] =
     "Cannot determine language: tab not loaded";
 
-}  // namespace extension_tabs_module_constants
+}  // namespace tabs_constants
+}  // namespace extensions
diff --git a/chrome/browser/extensions/extension_tabs_module_constants.h b/chrome/browser/extensions/api/tabs/tabs_constants.h
index 19b7c37..77836f3 100644
--- a/chrome/browser/extensions/extension_tabs_module_constants.h
+++ b/chrome/browser/extensions/api/tabs/tabs_constants.h
@@ -4,11 +4,12 @@
 
 // Constants used for the Tabs API and the Windows API.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_CONSTANTS_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_CONSTANTS_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_CONSTANTS_H_
+#define CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_CONSTANTS_H_
 #pragma once
 
-namespace extension_tabs_module_constants {
+namespace extensions {
+namespace tabs_constants {
 
 // Keys used in serializing tab data & events.
 extern const char kActiveKey[];
@@ -98,6 +99,7 @@ extern const char kMoreThanOneValuesError[];
 extern const char kLoadFileError[];
 extern const char kCannotDetermineLanguageOfUnloadedTab[];
 
-};  // namespace extension_tabs_module_constants
+};  // namespace tabs_constants
+};  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_TABS_MODULE_CONSTANTS_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_TABS_TABS_CONSTANTS_H_
diff --git a/chrome/browser/extensions/extension_tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc
index 393a9c0..f61157d 100644
--- a/chrome/browser/extensions/extension_tabs_test.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_test.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_tabs_module.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 
 #include <string>
 
@@ -11,8 +11,8 @@
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/profiles/profile.h"
@@ -22,7 +22,7 @@
 #include "chrome/test/base/ui_test_utils.h"
 #include "ui/gfx/rect.h"
 
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 namespace utils = extension_function_test_utils;
 
 namespace {
diff --git a/chrome/browser/extensions/browser_extension_window_controller.cc b/chrome/browser/extensions/browser_extension_window_controller.cc
index 86948f7..a22ac72 100644
--- a/chrome/browser/extensions/browser_extension_window_controller.cc
+++ b/chrome/browser/extensions/browser_extension_window_controller.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/browser/extensions/browser_extension_window_controller.h"
 
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/ui/browser.h"
@@ -22,7 +22,7 @@ int BrowserExtensionWindowController::GetWindowId() const {
   return static_cast<int>(browser_->session_id().id());
 }
 
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 
 std::string BrowserExtensionWindowController::GetWindowTypeText() const {
   if (browser_->is_type_popup())
diff --git a/chrome/browser/extensions/extension_browser_event_router.cc b/chrome/browser/extensions/extension_browser_event_router.cc
index 86d145a..a545e32 100644
--- a/chrome/browser/extensions/extension_browser_event_router.cc
+++ b/chrome/browser/extensions/extension_browser_event_router.cc
@@ -7,11 +7,11 @@
 #include "base/json/json_writer.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/extension_action/extension_page_actions_api_constants.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_event_names.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ -29,7 +29,7 @@
 #endif
 
 namespace events = extension_event_names;
-namespace tab_keys = extension_tabs_module_constants;
+namespace tab_keys = extensions::tabs_constants;
 namespace page_action_keys = extension_page_actions_api_constants;
 
 using content::NavigationController;
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index 030717d..484798b 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -11,7 +11,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
diff --git a/chrome/browser/extensions/extension_event_router.cc b/chrome/browser/extensions/extension_event_router.cc
index f7050e4..f5800b3 100644
--- a/chrome/browser/extensions/extension_event_router.cc
+++ b/chrome/browser/extensions/extension_event_router.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/extensions/extension_processes_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/lazy_background_task_queue.h"
 #include "chrome/browser/extensions/process_map.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/extensions/extension_function_registry.cc b/chrome/browser/extensions/extension_function_registry.cc
index 0e05a2e..734afda 100644
--- a/chrome/browser/extensions/extension_function_registry.cc
+++ b/chrome/browser/extensions/extension_function_registry.cc
@@ -23,11 +23,12 @@
 #include "chrome/browser/extensions/api/runtime/runtime_api.h"
 #include "chrome/browser/extensions/api/serial/serial_api.h"
 #include "chrome/browser/extensions/api/socket/socket_api.h"
+#include "chrome/browser/extensions/api/tabs/execute_code_in_tab_function.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h"
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
-#include "chrome/browser/extensions/execute_code_in_tab_function.h"
 #include "chrome/browser/extensions/extension_chrome_auth_private_api.h"
 #include "chrome/browser/extensions/extension_debugger_api.h"
 #include "chrome/browser/extensions/extension_font_settings_api.h"
@@ -42,7 +43,6 @@
 #include "chrome/browser/extensions/extension_preference_api.h"
 #include "chrome/browser/extensions/extension_processes_api.h"
 #include "chrome/browser/extensions/extension_record_api.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_test_api.h"
 #include "chrome/browser/extensions/settings/settings_api.h"
 #include "chrome/browser/extensions/system/system_api.h"
diff --git a/chrome/browser/extensions/extension_processes_api.cc b/chrome/browser/extensions/extension_processes_api.cc
index bd45f0a..fe86879 100644
--- a/chrome/browser/extensions/extension_processes_api.cc
+++ b/chrome/browser/extensions/extension_processes_api.cc
@@ -12,12 +12,12 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_function_util.h"
 #include "chrome/browser/extensions/extension_processes_api_constants.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
@@ -567,7 +567,7 @@ void GetProcessIdForTabFunction::GetProcessIdForTab() {
   if (!ExtensionTabUtil::GetTabById(tab_id_, profile(), include_incognito(),
                                     NULL, NULL, &contents, &tab_index)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        extension_tabs_module_constants::kTabNotFoundError,
+        extensions::tabs_constants::kTabNotFoundError,
         base::IntToString(tab_id_));
     result_.reset(Value::CreateIntegerValue(-1));
     SendResponse(false);
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 2e2db28..d11304c 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/extensions/extension_tab_util.h"
 
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/restore_tab_helper.h"
@@ -21,7 +21,7 @@
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 namespace errors = extension_manifest_errors;
 
 using content::NavigationEntry;
diff --git a/chrome/browser/extensions/extension_window_controller.cc b/chrome/browser/extensions/extension_window_controller.cc
index bf81a94..890e959 100644
--- a/chrome/browser/extensions/extension_window_controller.cc
+++ b/chrome/browser/extensions/extension_window_controller.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/extensions/extension_window_controller.h"
 
 #include "base/values.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_window_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/base_window.h"
@@ -29,7 +29,7 @@ Browser* ExtensionWindowController::GetBrowser() const {
   return NULL;
 }
 
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 
 base::DictionaryValue* ExtensionWindowController::CreateWindowValue() const {
   DictionaryValue* result = new DictionaryValue();
diff --git a/chrome/browser/extensions/platform_app_browsertest_util.cc b/chrome/browser/extensions/platform_app_browsertest_util.cc
index 0059e15..5f92c37 100644
--- a/chrome/browser/extensions/platform_app_browsertest_util.cc
+++ b/chrome/browser/extensions/platform_app_browsertest_util.cc
@@ -3,10 +3,11 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
+
 #include "base/command_line.h"
 #include "base/stringprintf.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc
index 6875e6d..55e1051 100644
--- a/chrome/browser/infobars/infobar_extension_api.cc
+++ b/chrome/browser/infobars/infobar_extension_api.cc
@@ -7,10 +7,10 @@
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_infobar_delegate.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
@@ -63,7 +63,7 @@ bool ShowInfoBarFunction::RunImpl() {
       &tab_contents,
       NULL)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
-        extension_tabs_module_constants::kTabNotFoundError,
+        extensions::tabs_constants::kTabNotFoundError,
         base::IntToString(tab_id));
     return false;
   }
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index d0422d8..630c27c 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -54,7 +54,6 @@
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/first_run/first_run.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index 909f944..62ef99d 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -18,10 +18,10 @@
 #include "chrome/browser/chrome_to_mobile_service_factory.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/defaults.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_browser_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_helper.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/location_bar_controller.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/profiles/profile.h"
diff --git a/chrome/browser/ui/extensions/shell_window.cc b/chrome/browser/ui/extensions/shell_window.cc
index 0ad2729..69cf956 100644
--- a/chrome/browser/ui/extensions/shell_window.cc
+++ b/chrome/browser/ui/extensions/shell_window.cc
@@ -6,7 +6,6 @@
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/intents/web_intents_util.h"
diff --git a/chrome/browser/ui/views/ash/launcher/launcher_platform_app_browsertest.cc b/chrome/browser/ui/views/ash/launcher/launcher_platform_app_browsertest.cc
index af586f8..b60b52e 100644
--- a/chrome/browser/ui/views/ash/launcher/launcher_platform_app_browsertest.cc
+++ b/chrome/browser/ui/views/ash/launcher/launcher_platform_app_browsertest.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/extensions/platform_app_browsertest_util.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
diff --git a/chrome/browser/ui/views/ash/panel_view_aura.cc b/chrome/browser/ui/views/ash/panel_view_aura.cc
index 310777c..6619085 100644
--- a/chrome/browser/ui/views/ash/panel_view_aura.cc
+++ b/chrome/browser/ui/views/ash/panel_view_aura.cc
@@ -6,11 +6,11 @@
 
 #include "ash/wm/panel_frame_view.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
-#include "chrome/browser/extensions/extension_tabs_module_constants.h"
 #include "chrome/browser/extensions/extension_window_controller.h"
 #include "chrome/browser/extensions/extension_window_list.h"
 #include "chrome/browser/profiles/profile.h"
@@ -37,7 +37,7 @@ const int kDefaultWidth = 200;
 const int kDefaultHeight = 300;
 }
 
-namespace keys = extension_tabs_module_constants;
+namespace keys = extensions::tabs_constants;
 
 namespace internal {
 
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 60f0bf6..a64b8f9 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -185,6 +185,8 @@
         'browser/extensions/api/socket/tcp_socket.h',
         'browser/extensions/api/socket/udp_socket.cc',
         'browser/extensions/api/socket/udp_socket.h',
+        'browser/extensions/api/tabs/tabs_constants.cc',
+        'browser/extensions/api/tabs/tabs_constants.h',
         'browser/extensions/api/terminal/terminal_extension_helper.cc',
         'browser/extensions/api/terminal/terminal_extension_helper.h',
         'browser/extensions/api/terminal/terminal_private_api.cc',
@@ -366,8 +368,6 @@
         'browser/extensions/extension_tab_id_map.h',
         'browser/extensions/extension_tab_util.cc',
         'browser/extensions/extension_tab_util.h',
-        'browser/extensions/extension_tabs_module_constants.cc',
-        'browser/extensions/extension_tabs_module_constants.h',
         'browser/extensions/extension_toolbar_model.cc',
         'browser/extensions/extension_toolbar_model.h',
         'browser/extensions/extension_uninstall_dialog.cc',
@@ -506,12 +506,14 @@
         }],
         ['enable_extensions==1', {
           'sources': [
+            'browser/extensions/api/tabs/execute_code_in_tab_function.cc',
+            'browser/extensions/api/tabs/execute_code_in_tab_function.h',
+            'browser/extensions/api/tabs/tabs.cc',
+            'browser/extensions/api/tabs/tabs.h',
             'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc',
             'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h',
             'browser/extensions/api/webstore_private/webstore_private_api.cc',
             'browser/extensions/api/webstore_private/webstore_private_api.h',
-            'browser/extensions/execute_code_in_tab_function.cc',
-            'browser/extensions/execute_code_in_tab_function.h',
             'browser/extensions/extension_chrome_auth_private_api.cc',
             'browser/extensions/extension_chrome_auth_private_api.h',
             'browser/extensions/extension_debugger_api.cc',
@@ -538,8 +540,6 @@
             'browser/extensions/extension_page_capture_api.h',
             'browser/extensions/extension_preference_api.cc',
             'browser/extensions/extension_preference_api.h',
-            'browser/extensions/extension_tabs_module.cc',
-            'browser/extensions/extension_tabs_module.h',
             'browser/extensions/extension_test_api.cc',
             'browser/extensions/extension_test_api.h',
             'browser/extensions/settings/settings_api.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index fa18d71..7e69db8 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2699,6 +2699,7 @@
         'browser/extensions/api/proxy/proxy_apitest.cc',
         'browser/extensions/api/serial/serial_apitest.cc',
         'browser/extensions/api/socket/socket_apitest.cc',
+        'browser/extensions/api/tabs/tabs_test.cc',
         'browser/extensions/api/terminal/terminal_private_apitest.cc',
         'browser/extensions/api/web_navigation/web_navigation_apitest.cc',
         'browser/extensions/api/web_request/web_request_apitest.cc',
@@ -2771,7 +2772,6 @@
         'browser/extensions/extension_startup_browsertest.cc',
         'browser/extensions/extension_storage_apitest.cc',
         'browser/extensions/extension_tabs_apitest.cc',
-        'browser/extensions/extension_tabs_test.cc',
         'browser/extensions/extension_test_message_listener.cc',
         'browser/extensions/extension_test_message_listener.h',
         'browser/extensions/extension_toolbar_model_browsertest.cc',