Reorganize api_tests directory.

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

[email protected]
BUG=30507

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34862 0039d316-1c4b-4281-b951-d872f2087c98
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 @@
   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_;
 }