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

103 files changed, 41 insertions, 41 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());
diff --git a/chrome/test/data/extensions/api_test/browser_action/background.html b/chrome/test/data/extensions/api_test/browser_action/basics/background.html
index 5379de0..5379de0 100644
--- a/chrome/test/data/extensions/api_test/browser_action/background.html
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/background.html
diff --git a/chrome/test/data/extensions/api_test/browser_action/icon.png b/chrome/test/data/extensions/api_test/browser_action/basics/icon.png
index 9a79a46..9a79a46 100755
--- a/chrome/test/data/extensions/api_test/browser_action/icon.png
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/icon.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/icon2.png b/chrome/test/data/extensions/api_test/browser_action/basics/icon2.png
index 9a79a46..9a79a46 100755
--- a/chrome/test/data/extensions/api_test/browser_action/icon2.png
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/icon2.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/manifest.json b/chrome/test/data/extensions/api_test/browser_action/basics/manifest.json
index 9604839..9604839 100755
--- a/chrome/test/data/extensions/api_test/browser_action/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/manifest.json
diff --git a/chrome/test/data/extensions/api_test/browser_action/update.html b/chrome/test/data/extensions/api_test/browser_action/basics/update.html
index a0a347c..a0a347c 100644
--- a/chrome/test/data/extensions/api_test/browser_action/update.html
+++ b/chrome/test/data/extensions/api_test/browser_action/basics/update.html
diff --git a/chrome/test/data/extensions/api_test/browser_action_no_icon/background.html b/chrome/test/data/extensions/api_test/browser_action/no_icon/background.html
index 5379de0..5379de0 100644
--- a/chrome/test/data/extensions/api_test/browser_action_no_icon/background.html
+++ b/chrome/test/data/extensions/api_test/browser_action/no_icon/background.html
diff --git a/chrome/test/data/extensions/api_test/browser_action_no_icon/manifest.json b/chrome/test/data/extensions/api_test/browser_action/no_icon/manifest.json
index ceffb65..ceffb65 100755
--- a/chrome/test/data/extensions/api_test/browser_action_no_icon/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/no_icon/manifest.json
diff --git a/chrome/test/data/extensions/api_test/browser_action_no_icon/update.html b/chrome/test/data/extensions/api_test/browser_action/no_icon/update.html
index 4aac446..4aac446 100644
--- a/chrome/test/data/extensions/api_test/browser_action_no_icon/update.html
+++ b/chrome/test/data/extensions/api_test/browser_action/no_icon/update.html
diff --git a/chrome/test/data/extensions/api_test/browser_action_no_icon/update2.html b/chrome/test/data/extensions/api_test/browser_action/no_icon/update2.html
index d5702ff..d5702ff 100644
--- a/chrome/test/data/extensions/api_test/browser_action_no_icon/update2.html
+++ b/chrome/test/data/extensions/api_test/browser_action/no_icon/update2.html
diff --git a/chrome/test/data/extensions/api_test/popup/chromium.png b/chrome/test/data/extensions/api_test/browser_action/popup/chromium.png
index cc9fb60..cc9fb60 100755
--- a/chrome/test/data/extensions/api_test/popup/chromium.png
+++ b/chrome/test/data/extensions/api_test/browser_action/popup/chromium.png
diff --git a/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json b/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
new file mode 100755
index 0000000..f353316
--- /dev/null
+++ b/chrome/test/data/extensions/api_test/browser_action/popup/manifest.json
@@ -0,0 +1,10 @@
+{

+  "name": "Popup tester",

+  "version": "0.1",

+  "description": "apitest for popups",

+  "browser_action": {

+      "name": "grow",

+      "icons": ["chromium.png"],

+      "popup": "popup.html"

+  }

+}

diff --git a/chrome/test/data/extensions/api_test/popup/popup.html b/chrome/test/data/extensions/api_test/browser_action/popup/popup.html
index 683ffe7..683ffe7 100644
--- a/chrome/test/data/extensions/api_test/popup/popup.html
+++ b/chrome/test/data/extensions/api_test/browser_action/popup/popup.html
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/background.html b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/background.html
index 7393c5d..7393c5d 100644
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/background.html
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/background.html
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon1.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon1.png
index 9a79a46..9a79a46 100755
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon1.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon1.png
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon2.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon2.png
index 8d3f710..8d3f710 100755
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon2.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon2.png
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon3.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon3.png
index 2d9dec3..2d9dec3 100755
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon3.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon3.png
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon4.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon4.png
index 896fc36..896fc36 100755
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon4.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon4.png
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon5.png b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon5.png
index a5afa25..a5afa25 100755
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/icon5.png
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/icon5.png
diff --git a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/manifest.json b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/manifest.json
index 2e11ba8..2e11ba8 100755
--- a/chrome/test/data/extensions/api_test/browser_action_tab_specific_state/manifest.json
+++ b/chrome/test/data/extensions/api_test/browser_action/tab_specific_state/manifest.json
diff --git a/chrome/test/data/extensions/api_test/content_script_all_frames/all_frames.js b/chrome/test/data/extensions/api_test/content_scripts/all_frames/all_frames.js
index 71d22fd..71d22fd 100644
--- a/chrome/test/data/extensions/api_test/content_script_all_frames/all_frames.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/all_frames/all_frames.js
diff --git a/chrome/test/data/extensions/api_test/content_script_all_frames/manifest.json b/chrome/test/data/extensions/api_test/content_scripts/all_frames/manifest.json
index 0f73a8f..0f73a8f 100644
--- a/chrome/test/data/extensions/api_test/content_script_all_frames/manifest.json
+++ b/chrome/test/data/extensions/api_test/content_scripts/all_frames/manifest.json
diff --git a/chrome/test/data/extensions/api_test/content_script_all_frames/test.html b/chrome/test/data/extensions/api_test/content_scripts/all_frames/test.html
index e8f8088..e8f8088 100644
--- a/chrome/test/data/extensions/api_test/content_script_all_frames/test.html
+++ b/chrome/test/data/extensions/api_test/content_scripts/all_frames/test.html
diff --git a/chrome/test/data/extensions/api_test/content_script_all_frames/top_frame_only.js b/chrome/test/data/extensions/api_test/content_scripts/all_frames/top_frame_only.js
index 76ad923..76ad923 100644
--- a/chrome/test/data/extensions/api_test/content_script_all_frames/top_frame_only.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/all_frames/top_frame_only.js
diff --git a/chrome/test/data/extensions/api_test/content_script_extension_process/background.html b/chrome/test/data/extensions/api_test/content_scripts/extension_process/background.html
index a33b1b1..a33b1b1 100644
--- a/chrome/test/data/extensions/api_test/content_script_extension_process/background.html
+++ b/chrome/test/data/extensions/api_test/content_scripts/extension_process/background.html
diff --git a/chrome/test/data/extensions/api_test/content_script_extension_process/injectionator.js b/chrome/test/data/extensions/api_test/content_scripts/extension_process/injectionator.js
index 8a2725d..8a2725d 100644
--- a/chrome/test/data/extensions/api_test/content_script_extension_process/injectionator.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/extension_process/injectionator.js
diff --git a/chrome/test/data/extensions/api_test/content_script_extension_process/manifest.json b/chrome/test/data/extensions/api_test/content_scripts/extension_process/manifest.json
index dec288e..dec288e 100644
--- a/chrome/test/data/extensions/api_test/content_script_extension_process/manifest.json
+++ b/chrome/test/data/extensions/api_test/content_scripts/extension_process/manifest.json
diff --git a/chrome/test/data/extensions/api_test/isolated_world1/a.js b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/a.js
index 95eacea..95eacea 100644
--- a/chrome/test/data/extensions/api_test/isolated_world1/a.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/a.js
diff --git a/chrome/test/data/extensions/api_test/isolated_world1/b.js b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/b.js
index 5e66b40..5e66b40 100644
--- a/chrome/test/data/extensions/api_test/isolated_world1/b.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/b.js
diff --git a/chrome/test/data/extensions/api_test/isolated_world1/background.html b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/background.html
index ff563d48..ff563d48 100644
--- a/chrome/test/data/extensions/api_test/isolated_world1/background.html
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/background.html
diff --git a/chrome/test/data/extensions/api_test/isolated_world1/c.js b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/c.js
index d3bbc41..d3bbc41 100644
--- a/chrome/test/data/extensions/api_test/isolated_world1/c.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/c.js
diff --git a/chrome/test/data/extensions/api_test/isolated_world1/manifest.json b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/manifest.json
index 0528cdd..0528cdd 100644
--- a/chrome/test/data/extensions/api_test/isolated_world1/manifest.json
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world1/manifest.json
diff --git a/chrome/test/data/extensions/api_test/isolated_world2/a.js b/chrome/test/data/extensions/api_test/content_scripts/isolated_world2/a.js
index 394feee..394feee 100644
--- a/chrome/test/data/extensions/api_test/isolated_world2/a.js
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world2/a.js
diff --git a/chrome/test/data/extensions/api_test/isolated_world2/background.html b/chrome/test/data/extensions/api_test/content_scripts/isolated_world2/background.html
index 731182f..731182f 100644
--- a/chrome/test/data/extensions/api_test/isolated_world2/background.html
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world2/background.html
diff --git a/chrome/test/data/extensions/api_test/isolated_world2/manifest.json b/chrome/test/data/extensions/api_test/content_scripts/isolated_world2/manifest.json
index c4c60b5..c4c60b5 100644
--- a/chrome/test/data/extensions/api_test/isolated_world2/manifest.json
+++ b/chrome/test/data/extensions/api_test/content_scripts/isolated_world2/manifest.json
diff --git a/chrome/test/data/extensions/api_test/executescript/1.css b/chrome/test/data/extensions/api_test/executescript/basic/1.css
index a814f5f..a814f5f 100644
--- a/chrome/test/data/extensions/api_test/executescript/1.css
+++ b/chrome/test/data/extensions/api_test/executescript/basic/1.css
diff --git a/chrome/test/data/extensions/api_test/executescript/manifest.json b/chrome/test/data/extensions/api_test/executescript/basic/manifest.json
index b2f3856..b2f3856 100644
--- a/chrome/test/data/extensions/api_test/executescript/manifest.json
+++ b/chrome/test/data/extensions/api_test/executescript/basic/manifest.json
diff --git a/chrome/test/data/extensions/api_test/executescript/script1.js b/chrome/test/data/extensions/api_test/executescript/basic/script1.js
index 1e22ba7..1e22ba7 100644
--- a/chrome/test/data/extensions/api_test/executescript/script1.js
+++ b/chrome/test/data/extensions/api_test/executescript/basic/script1.js
diff --git a/chrome/test/data/extensions/api_test/executescript/script2.js b/chrome/test/data/extensions/api_test/executescript/basic/script2.js
index 7276b1d..7276b1d 100644
--- a/chrome/test/data/extensions/api_test/executescript/script2.js
+++ b/chrome/test/data/extensions/api_test/executescript/basic/script2.js
diff --git a/chrome/test/data/extensions/api_test/executescript/script3.js b/chrome/test/data/extensions/api_test/executescript/basic/script3.js
index f8fcaf04..f8fcaf04 100644
--- a/chrome/test/data/extensions/api_test/executescript/script3.js
+++ b/chrome/test/data/extensions/api_test/executescript/basic/script3.js
diff --git a/chrome/test/data/extensions/api_test/executescript/test.html b/chrome/test/data/extensions/api_test/executescript/basic/test.html
index 8a2db2d..b0e16a3 100644
--- a/chrome/test/data/extensions/api_test/executescript/test.html
+++ b/chrome/test/data/extensions/api_test/executescript/basic/test.html
@@ -5,7 +5,7 @@ var fail = chrome.test.callbackFail;
 var assertEq = chrome.test.assertEq;
 var assertTrue = chrome.test.assertTrue;
 var relativePath =
-    '/files/extensions/api_test/executescript/test_executescript.html';
+    '/files/extensions/api_test/executescript/basic/test_executescript.html';
 var testUrl = 'http://a.com:1337' + relativePath;
 var testFailureUrl = 'http://b.com:1337' + relativePath;
 var firstEnter = true;
diff --git a/chrome/test/data/extensions/api_test/executescript/test_executescript.html b/chrome/test/data/extensions/api_test/executescript/basic/test_executescript.html
index 0f13642..0f13642 100644
--- a/chrome/test/data/extensions/api_test/executescript/test_executescript.html
+++ b/chrome/test/data/extensions/api_test/executescript/basic/test_executescript.html
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/frame0.html b/chrome/test/data/extensions/api_test/executescript/in_frame/frame0.html
index 6bb02a0..6bb02a0 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/frame0.html
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/frame0.html
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/frame1.html b/chrome/test/data/extensions/api_test/executescript/in_frame/frame1.html
index 148114b..148114b 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/frame1.html
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/frame1.html
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/frame2.html b/chrome/test/data/extensions/api_test/executescript/in_frame/frame2.html
index e8b5b3c..e8b5b3c 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/frame2.html
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/frame2.html
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/frame3.html b/chrome/test/data/extensions/api_test/executescript/in_frame/frame3.html
index 63f8807..63f8807 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/frame3.html
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/frame3.html
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/manifest.json b/chrome/test/data/extensions/api_test/executescript/in_frame/manifest.json
index b2f3856..b2f3856 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/manifest.json
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/manifest.json
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/script.js b/chrome/test/data/extensions/api_test/executescript/in_frame/script.js
index a4efa64..a4efa64 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/script.js
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/script.js
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/test.html b/chrome/test/data/extensions/api_test/executescript/in_frame/test.html
index a8e2f06..4dd18d1 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/test.html
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/test.html
@@ -5,7 +5,7 @@ var fail = chrome.test.callbackFail;
 var assertEq = chrome.test.assertEq;
 var assertTrue = chrome.test.assertTrue;
 var relativePath =
-    '/files/extensions/api_test/executescript_in_frame/test_executescript.html';
+    '/files/extensions/api_test/executescript/in_frame/test_executescript.html';
 var testUrl = 'http://a.com:1337' + relativePath;
 
 chrome.tabs.onUpdated.addListener(function(tabId, changeInfo, tab) {
diff --git a/chrome/test/data/extensions/api_test/executescript_in_frame/test_executescript.html b/chrome/test/data/extensions/api_test/executescript/in_frame/test_executescript.html
index b1f0b6c..b1f0b6c 100644
--- a/chrome/test/data/extensions/api_test/executescript_in_frame/test_executescript.html
+++ b/chrome/test/data/extensions/api_test/executescript/in_frame/test_executescript.html
diff --git a/chrome/test/data/extensions/api_test/connect/manifest.json b/chrome/test/data/extensions/api_test/messaging/connect/manifest.json
index 27e16d3..27e16d3 100644
--- a/chrome/test/data/extensions/api_test/connect/manifest.json
+++ b/chrome/test/data/extensions/api_test/messaging/connect/manifest.json
diff --git a/chrome/test/data/extensions/api_test/connect/page.js b/chrome/test/data/extensions/api_test/messaging/connect/page.js
index 2f737f70..2f737f70 100644
--- a/chrome/test/data/extensions/api_test/connect/page.js
+++ b/chrome/test/data/extensions/api_test/messaging/connect/page.js
diff --git a/chrome/test/data/extensions/api_test/connect/test.html b/chrome/test/data/extensions/api_test/messaging/connect/test.html
index b108a8d..b108a8d 100644
--- a/chrome/test/data/extensions/api_test/connect/test.html
+++ b/chrome/test/data/extensions/api_test/messaging/connect/test.html
diff --git a/chrome/test/data/extensions/api_test/connect_external/manifest.json b/chrome/test/data/extensions/api_test/messaging/connect_external/manifest.json
index c1b30cb..c1b30cb 100644
--- a/chrome/test/data/extensions/api_test/connect_external/manifest.json
+++ b/chrome/test/data/extensions/api_test/messaging/connect_external/manifest.json
diff --git a/chrome/test/data/extensions/api_test/connect_external/test.html b/chrome/test/data/extensions/api_test/messaging/connect_external/test.html
index cc9cfa4..cc9cfa4 100644
--- a/chrome/test/data/extensions/api_test/connect_external/test.html
+++ b/chrome/test/data/extensions/api_test/messaging/connect_external/test.html
diff --git a/chrome/test/data/extensions/api_test/override1/background.html b/chrome/test/data/extensions/api_test/override/background.html
index 3e7b4a4..3e7b4a4 100644
--- a/chrome/test/data/extensions/api_test/override1/background.html
+++ b/chrome/test/data/extensions/api_test/override/background.html
diff --git a/chrome/test/data/extensions/api_test/override1/downloads.html b/chrome/test/data/extensions/api_test/override/downloads.html
index 17927f2..17927f2 100644
--- a/chrome/test/data/extensions/api_test/override1/downloads.html
+++ b/chrome/test/data/extensions/api_test/override/downloads.html
diff --git a/chrome/test/data/extensions/api_test/override1/history.html b/chrome/test/data/extensions/api_test/override/history.html
index fedd7a0..fedd7a0 100644
--- a/chrome/test/data/extensions/api_test/override1/history.html
+++ b/chrome/test/data/extensions/api_test/override/history.html
diff --git a/chrome/test/data/extensions/api_test/override1/manifest.json b/chrome/test/data/extensions/api_test/override/manifest.json
index 1fd8311..1fd8311 100644
--- a/chrome/test/data/extensions/api_test/override1/manifest.json
+++ b/chrome/test/data/extensions/api_test/override/manifest.json
diff --git a/chrome/test/data/extensions/api_test/override1/newtab.html b/chrome/test/data/extensions/api_test/override/newtab.html
index 20b8f82..20b8f82 100644
--- a/chrome/test/data/extensions/api_test/override1/newtab.html
+++ b/chrome/test/data/extensions/api_test/override/newtab.html
diff --git a/chrome/test/data/extensions/api_test/override1/nonexistant.html b/chrome/test/data/extensions/api_test/override/nonexistant.html
index 927f5ca..927f5ca 100644
--- a/chrome/test/data/extensions/api_test/override1/nonexistant.html
+++ b/chrome/test/data/extensions/api_test/override/nonexistant.html
diff --git a/chrome/test/data/extensions/api_test/override1/test.js b/chrome/test/data/extensions/api_test/override/test.js
index 52db94d..52db94d 100644
--- a/chrome/test/data/extensions/api_test/override1/test.js
+++ b/chrome/test/data/extensions/api_test/override/test.js
diff --git a/chrome/test/data/extensions/api_test/page_action/background.html b/chrome/test/data/extensions/api_test/page_action/basics/background.html
index 89e8f6f..89e8f6f 100644
--- a/chrome/test/data/extensions/api_test/page_action/background.html
+++ b/chrome/test/data/extensions/api_test/page_action/basics/background.html
diff --git a/chrome/test/data/extensions/api_test/old_page_actions/icon.png b/chrome/test/data/extensions/api_test/page_action/basics/icon.png
index 9a79a46..9a79a46 100644..100755
--- a/chrome/test/data/extensions/api_test/old_page_actions/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/basics/icon.png
diff --git a/chrome/test/data/extensions/api_test/page_action/manifest.json b/chrome/test/data/extensions/api_test/page_action/basics/manifest.json
index e020f59..e020f59 100755
--- a/chrome/test/data/extensions/api_test/page_action/manifest.json
+++ b/chrome/test/data/extensions/api_test/page_action/basics/manifest.json
diff --git a/chrome/test/data/extensions/api_test/page_action/update.html b/chrome/test/data/extensions/api_test/page_action/basics/update.html
index d8952c0..d8952c0 100644
--- a/chrome/test/data/extensions/api_test/page_action/update.html
+++ b/chrome/test/data/extensions/api_test/page_action/basics/update.html
diff --git a/chrome/test/data/extensions/api_test/page_action/update2.html b/chrome/test/data/extensions/api_test/page_action/basics/update2.html
index 17f3b9f..17f3b9f 100644
--- a/chrome/test/data/extensions/api_test/page_action/update2.html
+++ b/chrome/test/data/extensions/api_test/page_action/basics/update2.html
diff --git a/chrome/test/data/extensions/api_test/old_page_actions/background.html b/chrome/test/data/extensions/api_test/page_action/old_api/background.html
index 650d37a..650d37a 100644
--- a/chrome/test/data/extensions/api_test/old_page_actions/background.html
+++ b/chrome/test/data/extensions/api_test/page_action/old_api/background.html
diff --git a/chrome/test/data/extensions/api_test/page_action/icon.png b/chrome/test/data/extensions/api_test/page_action/old_api/icon.png
index 9a79a46..9a79a46 100755..100644
--- a/chrome/test/data/extensions/api_test/page_action/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/old_api/icon.png
diff --git a/chrome/test/data/extensions/api_test/old_page_actions/manifest.json b/chrome/test/data/extensions/api_test/page_action/old_api/manifest.json
index b1d2b09..b1d2b09 100644
--- a/chrome/test/data/extensions/api_test/old_page_actions/manifest.json
+++ b/chrome/test/data/extensions/api_test/page_action/old_api/manifest.json
diff --git a/chrome/test/data/extensions/api_test/old_page_actions/page.html b/chrome/test/data/extensions/api_test/page_action/old_api/page.html
index 686e9066..686e9066 100644
--- a/chrome/test/data/extensions/api_test/old_page_actions/page.html
+++ b/chrome/test/data/extensions/api_test/page_action/old_api/page.html
diff --git a/chrome/test/data/extensions/api_test/page_action_popup/background.html b/chrome/test/data/extensions/api_test/page_action/popup/background.html
index 00f654a..00f654a 100644
--- a/chrome/test/data/extensions/api_test/page_action_popup/background.html
+++ b/chrome/test/data/extensions/api_test/page_action/popup/background.html
diff --git a/chrome/test/data/extensions/api_test/page_action_popup/icon.png b/chrome/test/data/extensions/api_test/page_action/popup/icon.png
index 9a79a46..9a79a46 100755
--- a/chrome/test/data/extensions/api_test/page_action_popup/icon.png
+++ b/chrome/test/data/extensions/api_test/page_action/popup/icon.png
diff --git a/chrome/test/data/extensions/api_test/page_action_popup/manifest.json b/chrome/test/data/extensions/api_test/page_action/popup/manifest.json
index ecc550c..ecc550c 100755
--- a/chrome/test/data/extensions/api_test/page_action_popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/page_action/popup/manifest.json
diff --git a/chrome/test/data/extensions/api_test/page_action_popup/popup.html b/chrome/test/data/extensions/api_test/page_action/popup/popup.html
index 7dbe750..7dbe750 100755
--- a/chrome/test/data/extensions/api_test/page_action_popup/popup.html
+++ b/chrome/test/data/extensions/api_test/page_action/popup/popup.html
diff --git a/chrome/test/data/extensions/api_test/popup/manifest.json b/chrome/test/data/extensions/api_test/popup/manifest.json
index f353316..01c2cee 100755..100644
--- a/chrome/test/data/extensions/api_test/popup/manifest.json
+++ b/chrome/test/data/extensions/api_test/popup/manifest.json
@@ -1,10 +1,8 @@
-{

-  "name": "Popup tester",

-  "version": "0.1",

-  "description": "apitest for popups",

-  "browser_action": {

-      "name": "grow",

-      "icons": ["chromium.png"],

-      "popup": "popup.html"

-  }

-}

+{
+  "name": "Popup tester",
+  "version": "0.1",
+  "description": "apitest for the popup api",
+  "toolstrips": [
+    "toolband.html"
+  ]
+}
diff --git a/chrome/test/data/extensions/api_test/popup_api/toolband.html b/chrome/test/data/extensions/api_test/popup/toolband.html
index 77467ee..77467ee 100644
--- a/chrome/test/data/extensions/api_test/popup_api/toolband.html
+++ b/chrome/test/data/extensions/api_test/popup/toolband.html
diff --git a/chrome/test/data/extensions/api_test/popup_api/toolband_popup.html b/chrome/test/data/extensions/api_test/popup/toolband_popup.html
index 67d4cdf..67d4cdf 100644
--- a/chrome/test/data/extensions/api_test/popup_api/toolband_popup.html
+++ b/chrome/test/data/extensions/api_test/popup/toolband_popup.html
diff --git a/chrome/test/data/extensions/api_test/popup_api/manifest.json b/chrome/test/data/extensions/api_test/popup_api/manifest.json
deleted file mode 100644
index 01c2cee..0000000
--- a/chrome/test/data/extensions/api_test/popup_api/manifest.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "name": "Popup tester",
-  "version": "0.1",
-  "description": "apitest for the popup api",
-  "toolstrips": [
-    "toolband.html"
-  ]
-}
diff --git a/chrome/test/data/extensions/api_test/tabs/a.html b/chrome/test/data/extensions/api_test/tabs/basics/a.html
index dcd442e..dcd442e 100644
--- a/chrome/test/data/extensions/api_test/tabs/a.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/a.html
diff --git a/chrome/test/data/extensions/api_test/tabs/b.html b/chrome/test/data/extensions/api_test/tabs/basics/b.html
index 7bff50a..7bff50a 100644
--- a/chrome/test/data/extensions/api_test/tabs/b.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/b.html
diff --git a/chrome/test/data/extensions/api_test/tabs/c.html b/chrome/test/data/extensions/api_test/tabs/basics/c.html
index ccaad19..ccaad19 100644
--- a/chrome/test/data/extensions/api_test/tabs/c.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/c.html
diff --git a/chrome/test/data/extensions/api_test/tabs/d.html b/chrome/test/data/extensions/api_test/tabs/basics/d.html
index 6d5df4a..6d5df4a 100644
--- a/chrome/test/data/extensions/api_test/tabs/d.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/d.html
diff --git a/chrome/test/data/extensions/api_test/tabs/e.html b/chrome/test/data/extensions/api_test/tabs/basics/e.html
index 8f6e3c1..8f6e3c1 100644
--- a/chrome/test/data/extensions/api_test/tabs/e.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/e.html
diff --git a/chrome/test/data/extensions/api_test/tabs/echo.js b/chrome/test/data/extensions/api_test/tabs/basics/echo.js
index 413a1d4..413a1d4 100644
--- a/chrome/test/data/extensions/api_test/tabs/echo.js
+++ b/chrome/test/data/extensions/api_test/tabs/basics/echo.js
diff --git a/chrome/test/data/extensions/api_test/tabs/f.html b/chrome/test/data/extensions/api_test/tabs/basics/f.html
index 0b00692..0b00692 100644
--- a/chrome/test/data/extensions/api_test/tabs/f.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/f.html
diff --git a/chrome/test/data/extensions/api_test/tabs/manifest.json b/chrome/test/data/extensions/api_test/tabs/basics/manifest.json
index dfc45f3..dfc45f3 100644
--- a/chrome/test/data/extensions/api_test/tabs/manifest.json
+++ b/chrome/test/data/extensions/api_test/tabs/basics/manifest.json
diff --git a/chrome/test/data/extensions/api_test/tabs/relative.html b/chrome/test/data/extensions/api_test/tabs/basics/relative.html
index 5a9e6ee8..5a9e6ee8 100644
--- a/chrome/test/data/extensions/api_test/tabs/relative.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/relative.html
diff --git a/chrome/test/data/extensions/api_test/tabs/tabs_util.js b/chrome/test/data/extensions/api_test/tabs/basics/tabs_util.js
index f087948..f087948 100644
--- a/chrome/test/data/extensions/api_test/tabs/tabs_util.js
+++ b/chrome/test/data/extensions/api_test/tabs/basics/tabs_util.js
diff --git a/chrome/test/data/extensions/api_test/tabs/test.html b/chrome/test/data/extensions/api_test/tabs/basics/test.html
index 54f4ab7..54f4ab7 100644
--- a/chrome/test/data/extensions/api_test/tabs/test.html
+++ b/chrome/test/data/extensions/api_test/tabs/basics/test.html
diff --git a/chrome/test/data/extensions/api_test/tabs/test.js b/chrome/test/data/extensions/api_test/tabs/basics/test.js
index a13bc79..a516ddc 100644
--- a/chrome/test/data/extensions/api_test/tabs/test.js
+++ b/chrome/test/data/extensions/api_test/tabs/basics/test.js
@@ -489,7 +489,7 @@ chrome.test.runTests([
 
   function setupConnect() {
     // The web page that our content script will be injected into.
-    var relativePath = '/files/extensions/api_test/tabs/relative.html';
+    var relativePath = '/files/extensions/api_test/tabs/basics/relative.html';
     var testUrl = 'http://localhost:1337' + relativePath;
 
     setupWindow([testUrl], pass(function(winId, tabIds) {
@@ -577,4 +577,3 @@ chrome.test.runTests([
   // It would be an improvement to check the captureVisibleTab results
   // against a known-good result.
 ]);
-
diff --git a/chrome/test/data/extensions/api_test/javascript_url_permissions/manifest.json b/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/manifest.json
index 34fc5c5..34fc5c5 100644
--- a/chrome/test/data/extensions/api_test/javascript_url_permissions/manifest.json
+++ b/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/manifest.json
diff --git a/chrome/test/data/extensions/api_test/javascript_url_permissions/test.html b/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/test.html
index 2295dd2..2295dd2 100644
--- a/chrome/test/data/extensions/api_test/javascript_url_permissions/test.html
+++ b/chrome/test/data/extensions/api_test/tabs/javascript_url_permissions/test.html