Reorganize api_tests directory.

This reapplies 34794 and 34779 with one additional fix,
which were reverted by 34798.

TBR=mpcomplete@chromium.org
BUG=30507

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

11 files changed, 20 insertions, 19 deletions

diff --git a/chrome/browser/extensions/browser_action_apitest.cc b/chrome/browser/extensions/browser_action_apitest.cc
index 30bcd50..1713b23 100644
--- a/chrome/browser/extensions/browser_action_apitest.cc
+++ b/chrome/browser/extensions/browser_action_apitest.cc
@@ -38,7 +38,7 @@ class BrowserActionApiTest : public ExtensionApiTest {
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("browser_action")) << message_;
+  ASSERT_TRUE(RunExtensionTest("browser_action/basics")) << message_;
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
@@ -78,7 +78,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
-  ASSERT_TRUE(RunExtensionTest("browser_action_no_icon")) << message_;
+  ASSERT_TRUE(RunExtensionTest("browser_action/no_icon")) << message_;
 
   // Test that there is a browser action in the toolbar and that it has no icon.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
@@ -107,7 +107,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DynamicBrowserAction) {
 }
 
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
-  ASSERT_TRUE(RunExtensionTest("browser_action_tab_specific_state")) <<
+  ASSERT_TRUE(RunExtensionTest("browser_action/tab_specific_state")) <<
       message_;
 
   // Test that there is a browser action in the toolbar and that it has an icon.
@@ -136,7 +136,8 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, TabSpecificBrowserActionState) {
 // TODO(estade): http://crbug.com/29710 port to Mac & Linux
 #if defined(OS_WIN)
 IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, BrowserActionPopup) {
-  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("popup")));
+  ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
+      "browser_action/popup")));
 
   ResultCatcher catcher;
 
diff --git a/chrome/browser/extensions/content_script_all_frames_apitest.cc b/chrome/browser/extensions/content_script_all_frames_apitest.cc
index 1f61ea4..7dc636c 100644
--- a/chrome/browser/extensions/content_script_all_frames_apitest.cc
+++ b/chrome/browser/extensions/content_script_all_frames_apitest.cc
@@ -6,5 +6,5 @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptAllFrames) {
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("content_script_all_frames")) << message_;
+  ASSERT_TRUE(RunExtensionTest("content_scripts/all_frames")) << message_;
 }
diff --git a/chrome/browser/extensions/content_script_extension_process_apitest.cc b/chrome/browser/extensions/content_script_extension_process_apitest.cc
index 18ee070..48f92f1 100644
--- a/chrome/browser/extensions/content_script_extension_process_apitest.cc
+++ b/chrome/browser/extensions/content_script_extension_process_apitest.cc
@@ -11,5 +11,5 @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptExtensionProcess) {
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("content_script_extension_process")) << message_;
+  ASSERT_TRUE(RunExtensionTest("content_scripts/extension_process")) << message_;
 }
diff --git a/chrome/browser/extensions/execute_script_apitest.cc b/chrome/browser/extensions/execute_script_apitest.cc
index 1f4cbf0..902ffe6 100644
--- a/chrome/browser/extensions/execute_script_apitest.cc
+++ b/chrome/browser/extensions/execute_script_apitest.cc
@@ -11,6 +11,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_ExecuteScript) {
   host_resolver()->AddRule("b.com", "127.0.0.1");
   StartHTTPServer();
 
-  ASSERT_TRUE(RunExtensionTest("executescript")) << message_;
-  ASSERT_TRUE(RunExtensionTest("executescript_in_frame")) << message_;
+  ASSERT_TRUE(RunExtensionTest("executescript/basic")) << message_;
+  ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_javascript_url_apitest.cc b/chrome/browser/extensions/extension_javascript_url_apitest.cc
index 87e4789..aaa7b30 100644
--- a/chrome/browser/extensions/extension_javascript_url_apitest.cc
+++ b/chrome/browser/extensions/extension_javascript_url_apitest.cc
@@ -9,5 +9,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, JavaScriptURLPermissions) {
   host_resolver()->AddRule("b.com", "127.0.0.1");
   StartHTTPServer();
 
-  ASSERT_TRUE(RunExtensionTest("javascript_url_permissions")) << message_;
+  ASSERT_TRUE(RunExtensionTest("tabs/javascript_url_permissions")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index c4e58cb..e2e969f 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -7,7 +7,7 @@
 // Tests that message passing between extensions and content scripts works.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Messaging) {
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("connect")) << message_;
+  ASSERT_TRUE(RunExtensionTest("messaging/connect")) << message_;
 }
 
 // Tests that message passing from one extension to another works.
@@ -18,5 +18,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MessagingExternal) {
                     .AppendASCII("bjafgdebaacbbbecmhlhpofkepfkgcpa")
                     .AppendASCII("1.0")));
 
-  ASSERT_TRUE(RunExtensionTest("connect_external")) << message_;
+  ASSERT_TRUE(RunExtensionTest("messaging/connect_external")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc
index 0ebe460..a7a66b7 100644
--- a/chrome/browser/extensions/extension_override_apitest.cc
+++ b/chrome/browser/extensions/extension_override_apitest.cc
@@ -6,7 +6,7 @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Overrides) {
   // The first pass response is the creation of a new tab.
-  ASSERT_TRUE(RunExtensionTest("override1")) << message_;
+  ASSERT_TRUE(RunExtensionTest("override")) << message_;
 
   // TODO(erikkay) load a second override and verify behavior, then unload
   // the first and verify behavior, etc.
diff --git a/chrome/browser/extensions/extension_popup_apitest.cc b/chrome/browser/extensions/extension_popup_apitest.cc
index 6095d5d..0ed45c3 100644
--- a/chrome/browser/extensions/extension_popup_apitest.cc
+++ b/chrome/browser/extensions/extension_popup_apitest.cc
@@ -13,5 +13,5 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FLAKY_Popup) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExtensionToolstrips);
 
-  ASSERT_TRUE(RunExtensionTest("popup_api")) << message_;
+  ASSERT_TRUE(RunExtensionTest("popup")) << message_;
 }
diff --git a/chrome/browser/extensions/extension_tabs_apitest.cc b/chrome/browser/extensions/extension_tabs_apitest.cc
index 5af2863..427f6cf 100644
--- a/chrome/browser/extensions/extension_tabs_apitest.cc
+++ b/chrome/browser/extensions/extension_tabs_apitest.cc
@@ -6,5 +6,5 @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, Tabs) {
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("tabs")) << message_;
+  ASSERT_TRUE(RunExtensionTest("tabs/basics")) << message_;
 }
diff --git a/chrome/browser/extensions/isolated_world_apitest.cc b/chrome/browser/extensions/isolated_world_apitest.cc
index 25c6144..198f39a 100644
--- a/chrome/browser/extensions/isolated_world_apitest.cc
+++ b/chrome/browser/extensions/isolated_world_apitest.cc
@@ -8,9 +8,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IsolatedWorld1) {
   // This extension runs various bits of script and tests that they all run in
   // the same isolated world.
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("isolated_world1")) << message_;
+  ASSERT_TRUE(RunExtensionTest("content_scripts/isolated_world1")) << message_;
 
   // Now load a different extension, inject into same page, verify worlds aren't
   // shared.
-  ASSERT_TRUE(RunExtensionTest("isolated_world2")) << message_;
+  ASSERT_TRUE(RunExtensionTest("content_scripts/isolated_world2")) << message_;
 }
diff --git a/chrome/browser/extensions/page_action_apitest.cc b/chrome/browser/extensions/page_action_apitest.cc
index 04d33e2..d7c385d 100644
--- a/chrome/browser/extensions/page_action_apitest.cc
+++ b/chrome/browser/extensions/page_action_apitest.cc
@@ -16,7 +16,7 @@
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
   StartHTTPServer();
-  ASSERT_TRUE(RunExtensionTest("page_action")) << message_;
+  ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;
 
   ExtensionsService* service = browser()->profile()->GetExtensionsService();
   ASSERT_EQ(1u, service->extensions()->size());
@@ -64,7 +64,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, PageAction) {
 // Tests old-style pageActions API that is deprecated but we don't want to
 // break.
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OldPageActions) {
-  ASSERT_TRUE(RunExtensionTest("old_page_actions")) << message_;
+  ASSERT_TRUE(RunExtensionTest("page_action/old_api")) << message_;
 
   ExtensionsService* service = browser()->profile()->GetExtensionsService();
   ASSERT_EQ(1u, service->extensions()->size());
@@ -149,7 +149,7 @@ IN_PROC_BROWSER_TEST_F(PageActionPopupTest, MAYBE_Show) {
                 NotificationType::EXTENSION_PAGE_ACTION_VISIBILITY_CHANGED,
                 NotificationService::AllSources());
 
-  ASSERT_TRUE(RunExtensionTest("page_action_popup")) << message_;
+  ASSERT_TRUE(RunExtensionTest("page_action/popup")) << message_;
 
   ExtensionsService* service = browser()->profile()->GetExtensionsService();
   ASSERT_EQ(1u, service->extensions()->size());