Protect the entire webstore origin, not just the webstore path, with XFO. Follow-up to crrev.com/1…

chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc

 // Copyright (c) 2012 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.
 
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 78 matching lines @@
 };
 
 }  // namespace
 
 // A base class for tests below.
 class ExtensionWebstorePrivateApiTest : public ExtensionApiTest {
  public:
   void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
-        switches::kAppsGalleryURL, "http://www.example.com");
+        switches::kAppsGalleryURL,
+        "http://www.example.com/files/extensions/api_test");
     command_line->AppendSwitchASCII(
         switches::kAppsGalleryInstallAutoConfirmForTests, "accept");
   }
 
   void SetUpInProcessBrowserTestFixture() OVERRIDE {
     // Start up the test server and get us ready for calling the install
     // API functions.
     host_resolver()->AddRule("www.example.com", "127.0.0.1");
     ASSERT_TRUE(test_server()->Start());
     ExtensionInstallUI::DisableFailureUIForTests();
@@ skipping 144 matching lines @@
             function.get(), kEmptyArgs, browser()));
     EXPECT_EQ(base::Value::TYPE_STRING, result->GetType());
     StringValue* value = static_cast<StringValue*>(result.get());
     std::string webgl_status = "";
     EXPECT_TRUE(value && value->GetAsString(&webgl_status));
     EXPECT_STREQ(webgl_allowed ? kWebGLStatusAllowed : kWebGLStatusBlocked,
                  webgl_status.c_str());
   }
 };
 
-// Test case for webstore origin frame blocking.
-IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, FLAKY_FrameBlocked) {
+// Test cases for webstore origin frame blocking.
+IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,
+                       FrameWebstorePageBlocked) {
   content::WebContents* contents = chrome::GetActiveWebContents(browser());
   string16 expected_title = UTF8ToUTF16("PASS: about:blank");
   string16 failure_title = UTF8ToUTF16("FAIL");
   content::TitleWatcher watcher(contents, expected_title);
   watcher.AlsoWaitForTitle(failure_title);
   GURL url = test_server()->GetURL(
       "files/extensions/api_test/webstore_private/noframe.html");
   ui_test_utils::NavigateToURL(browser(), url);
   string16 final_title = watcher.WaitAndGetTitle();
   EXPECT_EQ(expected_title, final_title);
 }
 
+IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest,
+                       FrameErrorPageBlocked) {
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
+  string16 expected_title = UTF8ToUTF16("PASS: about:blank");
+  string16 failure_title = UTF8ToUTF16("FAIL");
+  content::TitleWatcher watcher(contents, expected_title);
+  watcher.AlsoWaitForTitle(failure_title);
+  GURL url = test_server()->GetURL(
+      "files/extensions/api_test/webstore_private/noframe2.html");
+  ui_test_utils::NavigateToURL(browser(), url);
+  string16 final_title = watcher.WaitAndGetTitle();
+  EXPECT_EQ(expected_title, final_title);
+}
+
 // Test cases where the user accepts the install confirmation dialog.
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, InstallAccepted) {
   ASSERT_TRUE(RunInstallTest("accepted.html", "extension.crx"));
 }
 
 // Test having the default download directory missing.
 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, MissingDownloadDir) {
   // Set a non-existent directory as the download path.
   ScopedTempDir temp_dir;
   EXPECT_TRUE(temp_dir.CreateUniqueTempDir());
@@ skipping 165 matching lines @@
       json_blacklist, gpu_info);
   GpuFeatureType type =
       content::GpuDataManager::GetInstance()->GetBlacklistedFeatures();
   EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
 
   bool webgl_allowed = false;
   RunTest(webgl_allowed);
 }
 
 }  // namespace extensions