Update entry page type to include error pages when appropriate.

chrome/browser/extensions/api/tabs/tabs_test.cc

Index: chrome/browser/extensions/api/tabs/tabs_test.cc
diff --git a/chrome/browser/extensions/api/tabs/tabs_test.cc b/chrome/browser/extensions/api/tabs/tabs_test.cc
index f890355e3afd15593d7f44c71dca8bb98ff7febf..cd55290a5241a847d013462c6d62a1acffe53766 100644
--- a/chrome/browser/extensions/api/tabs/tabs_test.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_test.cc
@@ -27,6 +27,7 @@
 #include "content/public/common/url_constants.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/test_util.h"
+#include "net/test/spawned_test_server/spawned_test_server.h"
 #include "ui/gfx/rect.h"
 
 namespace extensions {
@@ -796,11 +797,20 @@ IN_PROC_BROWSER_TEST_F(ExtensionTabsZoomTest, SetAndGetZoom) {
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionTabsZoomTest, ZoomSettings) {
-  const char kNewTestTabArgsA[] = "http://hostA/";
-  const char kNewTestTabArgsB[] = "http://hostB/";
-
-  GURL url_A(kNewTestTabArgsA);
-  GURL url_B(kNewTestTabArgsB);
+  // In this test we need two URLs that (1) represent real pages (i.e. they

[Charlie Reis, 2014/09/24 16:43:43]

FYI: You can also achieve this with a host resolver that rewrites all domains to
localhost:

  host_resolver()->AddRule("*", "127.0.0.1");
  ASSERT_TRUE(test_server()->Start());

You can then create URLs on arbitrary origins with:

  GURL::Replacements replace_host;
  std::string foo_com("foo.com");
  GURL cross_site_url(test_server()->GetURL("files/title2.html"));
  replace_host.SetHostStr(foo_com);
  cross_site_url = cross_site_url.ReplaceComponents(replace_host);

There's examples in SitePerProcessBrowserTest.

It's fine to stick with the about:blank transition if it meets your needs, but
the other way is more general if you need to handle more domains.

[wjmaclean, 2014/09/24 17:59:11]

Unfortunately this doesn't work in this case, since HostZoomMap operates on
re-written URLs, so it sees the localhost domain for everything and the test
becomes invalid (and fails). Oh well :-)

+  // load without causing an error page load), (2) have different domains, and
+  // (3) are zoomable by the extension API (this last condition rules out
+  // chrome:// urls). We achieve this by noting that about:blank meets these
+  // requirements, allowing us to spin up a spawned http server on localhost to
+  // get the other domain.
+  net::SpawnedTestServer http_server(
+      net::SpawnedTestServer::TYPE_HTTP,
+      net::SpawnedTestServer::kLocalhost,
+      base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
+  ASSERT_TRUE(http_server.Start());
+
+  GURL url_A = http_server.GetURL("files/simple.html");
+  GURL url_B("about:blank");
 
   // Tabs A1 and A2 are navigated to the same origin, while B is navigated
   // to a different one.