Adjust ServerRedirectSingleProcess expectations for site-per-process.

WebNavigationApiTest.ServerRedirectSingleProcess from browser_tests has
its expectations in
serverRedirectSingleProcess/test_serverRedirectSingleProcess.js.  The
expectations include exact |processId| ("exact" meaning that one cannot
use a wildcard - the verification is done via chrome.test.checkDeepEq).
Inclusion of |processId| means that the expectation change in
site-per-process mode.

This CL flips the expectations to match the expected behavior in
site-per-process mode and disables the test outside of site-per-process
mode.  The "disabling" can be removed in a follow-up CL, after we only
run //chrome-layer tests in site-per-process mode.

Bug: 671734
Change-Id: I984d67342008c3025b84406d99d4798ca46d77f6
Reviewed-on: https://chromium-review.googlesource.com/1162909Reviewed-by: Nasko Oskov <nasko@chromium.org>
Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org>
Cr-Commit-Position: refs/heads/master@{#581003}

chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -246,9 +246,18 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Download) {
 }
 
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, ServerRedirectSingleProcess) {
-  // TODO(lukasza): https://crbug.com/671734: Investigate why this test fails
-  // with --site-per-process.
-  if (content::AreAllSitesIsolatedForTesting())
+  // TODO(lukasza): https://crbug.com/671734: In the long-term, //chrome-layer
+  // tests should only be run with site-per-process - remove the early return
+  // below when fixing https://crbug.com/870761 and removing the
+  // not_site_per_process_browser_tests step.
+  //
+  // This test has its expectations in
+  // serverRedirectSingleProcess/test_serverRedirectSingleProcess.js.  The
+  // expectations include exact |processId| ("exact" meaning that one cannot use
+  // a wildcard - the verification is done via chrome.test.checkDeepEq).
+  // Inclusion of |processId| means that the expectation change in
+  // site-per-process mode.
+  if (!content::AreAllSitesIsolatedForTesting())
     return;
 
   ASSERT_TRUE(StartEmbeddedTestServer());

chrome/test/data/extensions/api_test/webnavigation/serverRedirectSingleProcess/test_serverRedirectSingleProcess.js

@@ -69,7 +69,7 @@ onload = function() {
             { label: "b-onCommitted",
               event: "onCommitted",
               details: { frameId: 0,
-                         processId: 0,
+                         processId: 1,
                          tabId: 0,
                          timeStamp: 0,
                          transitionQualifiers: ["server_redirect"],
@@ -78,14 +78,14 @@ onload = function() {
             { label: "b-onDOMContentLoaded",
               event: "onDOMContentLoaded",
               details: { frameId: 0,
-                         processId: 0,
+                         processId: 1,
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_TARGET }},
             { label: "b-onCompleted",
               event: "onCompleted",
               details: { frameId: 0,
-                         processId: 0,
+                         processId: 1,
                          tabId: 0,
                          timeStamp: 0,
                          url: URL_TARGET }}],