Revert r96075 Split ExtensionWebRequestApiTest.WebRequestEvents into multiple

chrome/browser/extensions/extension_webrequest_apitest.cc

Index: chrome/browser/extensions/extension_webrequest_apitest.cc
diff --git a/chrome/browser/extensions/extension_webrequest_apitest.cc b/chrome/browser/extensions/extension_webrequest_apitest.cc
index 1ba776c6d45369db705d8fd19dcac31254063a95..41db97dced6021487ec3dc9054137a4c4a513f76 100644
--- a/chrome/browser/extensions/extension_webrequest_apitest.cc
+++ b/chrome/browser/extensions/extension_webrequest_apitest.cc
@@ -50,36 +50,25 @@ class ExtensionWebRequestApiTest : public ExtensionApiTest {
   }
 };
 
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestApi) {
+IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequest) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableExperimentalExtensionApis);
 
-  ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_api.html")) << message_;
+  ASSERT_TRUE(RunExtensionTest("webrequest/api")) << message_;
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
+// http://crbug.com/91715
+#if defined(OS_MACOSX)
+#define MAYBE_WebRequestEvents DISABLED_WebRequestEvents
+#else
+#define MAYBE_WebRequestEvents WebRequestEvents
+#endif
 
-  ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) <<
-      message_;
-}
-
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) {
+IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, MAYBE_WebRequestEvents) {
   CommandLine::ForCurrentProcess()->AppendSwitch(
     switches::kEnableExperimentalExtensionApis);
 
-  // Needed for the auth tests.
   CancelLoginDialog login_dialog_helper;
 
-  ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) <<
-    message_;
-}
-
-IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestBlocking) {
-  CommandLine::ForCurrentProcess()->AppendSwitch(
-      switches::kEnableExperimentalExtensionApis);
-
-  ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) <<
-      message_;
+  ASSERT_TRUE(RunExtensionTest("webrequest/events")) << message_;
 }