Convert another batch of extension tests to manifest_version 2

chrome/test/data/extensions/api_test/webrequest/test_simple.html

Index: chrome/test/data/extensions/api_test/webrequest/test_simple.html
===================================================================
--- chrome/test/data/extensions/api_test/webrequest/test_simple.html	(revision 112565)
+++ chrome/test/data/extensions/api_test/webrequest/test_simple.html	(working copy)
@@ -1,231 +1,7 @@
-<script src="framework.js">
-</script>
-<script>
-// Constants as functions, not to be called until after runTests.
-function getURLHttpSimpleLoad() {
-  return getServerURL('files/extensions/api_test/webrequest/simpleLoad/a.html');
-}
-
-function getURLHttpSimpleLoadRedirect() {
-  return getServerURL('server-redirect?'+getURLHttpSimpleLoad());
-}
-
-// A URL from b.com, which we don't have permission to access.
-function getURLNotVisible() {
-  return getServerURL('files/extensions/api_test/webrequest/simpleLoad/b.html',
-                      'b.com');
-}
-
-runTests([
-  // Navigates to a blank page.
-  function simpleLoad() {
-    expect(
-      [  // events
-        { label: "a-onBeforeRequest",
-          event: "onBeforeRequest",
-          details: {
-            url: getURL("simpleLoad/a.html"),
-            frameUrl: getURL("simpleLoad/a.html")
-          }
-        },
-        { label: "a-onResponseStarted",
-          event: "onResponseStarted",
-          details: {
-            url: getURL("simpleLoad/a.html"),
-            statusCode: 200,
-            fromCache: false,
-            statusLine: "HTTP/1.1 200 OK",
-            // Request to chrome-extension:// url has no IP.
-          }
-        },
-        { label: "a-onCompleted",
-          event: "onCompleted",
-          details: {
-            url: getURL("simpleLoad/a.html"),
-            statusCode: 200,
-            fromCache: false,
-            statusLine: "HTTP/1.1 200 OK",
-            // Request to chrome-extension:// url has no IP.
-          }
-        },
-      ],
-      [  // event order
-      ["a-onBeforeRequest", "a-onResponseStarted", "a-onCompleted"] ]);
-    navigateAndWait(getURL("simpleLoad/a.html"));
-  },
-
-  // Navigates to a blank page via HTTP. Only HTTP requests get the
-  // onBeforeSendHeaders event.
-  function simpleLoadHttp() {
-    expect(
-      [  // events
-        { label: "onBeforeRequest-1",
-          event: "onBeforeRequest",
-          details: {
-            url: getURLHttpSimpleLoadRedirect(),
-            frameUrl: getURLHttpSimpleLoadRedirect()
-          }
-        },
-        { label: "onBeforeSendHeaders-1",
-          event: "onBeforeSendHeaders",
-          details: {
-            url: getURLHttpSimpleLoadRedirect(),
-            requestHeadersValid: true
-          }
-        },
-        { label: "onSendHeaders-1",
-          event: "onSendHeaders",
-          details: {
-            url: getURLHttpSimpleLoadRedirect(),
-            requestHeadersValid: true
-          }
-        },
-        { label: "onHeadersReceived-1",
-          event: "onHeadersReceived",
-          details: {
-            url: getURLHttpSimpleLoadRedirect(),
-            responseHeadersExist: true,
-            statusLine: "HTTP/1.0 301 Moved Permanently"
-          }
-        },
-        { label: "onBeforeRedirect",
-          event: "onBeforeRedirect",
-          details: {
-            url: getURLHttpSimpleLoadRedirect(),
-            redirectUrl: getURLHttpSimpleLoad(),
-            statusCode: 301,
-            responseHeadersExist: true,
-            ip: "127.0.0.1",
-            fromCache: false,
-            statusLine: "HTTP/1.0 301 Moved Permanently"
-          }
-        },
-        { label: "onBeforeRequest-2",
-          event: "onBeforeRequest",
-          details: {
-            url: getURLHttpSimpleLoad(),
-            frameUrl: getURLHttpSimpleLoad()
-          }
-        },
-        { label: "onBeforeSendHeaders-2",
-          event: "onBeforeSendHeaders",
-          details: {
-            url: getURLHttpSimpleLoad(),
-            requestHeadersValid: true
-          }
-        },
-        { label: "onSendHeaders-2",
-          event: "onSendHeaders",
-          details: {
-            url: getURLHttpSimpleLoad(),
-            requestHeadersValid: true
-          }
-        },
-        { label: "onHeadersReceived-2",
-          event: "onHeadersReceived",
-          details: {
-            url: getURLHttpSimpleLoad(),
-            responseHeadersExist: true,
-            statusLine: "HTTP/1.0 200 OK",
-          }
-        },
-        { label: "onResponseStarted",
-          event: "onResponseStarted",
-          details: {
-            url: getURLHttpSimpleLoad(),
-            statusCode: 200,
-            responseHeadersExist: true,
-            ip: "127.0.0.1",
-            fromCache: false,
-            statusLine: "HTTP/1.0 200 OK",
-          }
-        },
-        { label: "onCompleted",
-          event: "onCompleted",
-          details: {
-            url: getURLHttpSimpleLoad(),
-            statusCode: 200,
-            ip: "127.0.0.1",
-            fromCache: false,
-            responseHeadersExist: true,
-            statusLine: "HTTP/1.0 200 OK"
-          }
-        }
-      ],
-      [  // event order
-        ["onBeforeRequest-1", "onBeforeSendHeaders-1", "onSendHeaders-1",
-         "onHeadersReceived-1", "onBeforeRedirect",
-         "onBeforeRequest-2", "onBeforeSendHeaders-2", "onSendHeaders-2",
-         "onHeadersReceived-2", "onResponseStarted", "onCompleted"] ],
-      {},  // filter
-      ["requestHeaders", "responseHeaders"]);
-    navigateAndWait(getURLHttpSimpleLoadRedirect());
-  },
-
-  // Navigates to a non-existing page.
-  function nonExistingLoad() {
-    expect(
-      [  // events
-        { label: "onBeforeRequest",
-          event: "onBeforeRequest",
-          details: {
-            url: getURL("does_not_exist.html"),
-            frameUrl: getURL("does_not_exist.html")
-          }
-        },
-        { label: "onErrorOccurred",
-          event: "onErrorOccurred",
-          details: {
-            url: getURL("does_not_exist.html"),
-            fromCache: false,
-            error: "net::ERR_FILE_NOT_FOUND",
-            // Request to chrome-extension:// url has no IP.
-          }
-        },
-      ],
-      [  // event order
-        ["onBeforeRequest", "onErrorOccurred"] ]);
-    navigateAndWait(getURL("does_not_exist.html"));
-  },
-
-  // Navigates to a page that we don't have access to, then a blank page.
-  // We should not see the first navigation.
-  function simpleLoadNonVisible() {
-    expect(
-      [  // events
-        { label: "a-onBeforeRequest",
-          event: "onBeforeRequest",
-          details: {
-            url: getURL("simpleLoad/a.html"),
-            frameUrl: getURL("simpleLoad/a.html")
-          }
-        },
-        { label: "a-onResponseStarted",
-          event: "onResponseStarted",
-          details: {
-            url: getURL("simpleLoad/a.html"),
-            statusCode: 200,
-            fromCache: false,
-            statusLine: "HTTP/1.1 200 OK",
-            // Request to chrome-extension:// url has no IP.
-          }
-        },
-        { label: "a-onCompleted",
-          event: "onCompleted",
-          details: {
-            url: getURL("simpleLoad/a.html"),
-            statusCode: 200,
-            fromCache: false,
-            statusLine: "HTTP/1.1 200 OK",
-            // Request to chrome-extension:// url has no IP.
-          }
-        },
-      ],
-      [  // event order
-      ["a-onBeforeRequest", "a-onResponseStarted", "a-onCompleted"] ]);
-    navigateAndWait(getURLNotVisible(), function() {
-      navigateAndWait(getURL("simpleLoad/a.html"));
-    });
-  },
-]);
-</script>
+<!--
+ * Copyright (c) 2011 The Chromium Authors. All rights reserved.  Use of this
+ * source code is governed by a BSD-style license that can be found in the
+ * LICENSE file.
+-->
+<script src="framework.js"></script>
+<script src="test_simple.js"></script>