Properly decode IDN in interstitials

chrome/browser/interstitials/security_interstitial_page_test_utils.cc

Index: chrome/browser/interstitials/security_interstitial_page_test_utils.cc
diff --git a/chrome/browser/interstitials/security_interstitial_page_test_utils.cc b/chrome/browser/interstitials/security_interstitial_page_test_utils.cc
new file mode 100644
index 0000000000000000000000000000000000000000..d0a9f2d01c43c60423e10dd2d63760449122d04c
--- /dev/null
+++ b/chrome/browser/interstitials/security_interstitial_page_test_utils.cc
@@ -0,0 +1,73 @@
+// Copyright 2015 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 "chrome/browser/interstitials/security_interstitial_page_test_utils.h"
+
+#include <string>
+
+#include "base/prefs/pref_service.h"
+#include "base/strings/stringprintf.h"
+#include "chrome/browser/interstitials/security_interstitial_page.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/pref_names.h"
+#include "content/public/browser/interstitial_page.h"
+#include "content/public/browser/web_contents.h"
+#include "content/public/test/browser_test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+
+namespace chrome_browser_interstitials {
+
+bool IsInterstitialDisplayingText(content::InterstitialPage* interstitial,
+                                  const std::string& text) {
+  // It's valid for |text| to contain "\'", but simply look for "'" instead
+  // since this function is used for searching host names and a predefined
+  // string.
+  DCHECK(text.find("\'") == std::string::npos);
+  std::string command = base::StringPrintf(
+      "var hasText = document.body.textContent.indexOf('%s') >= 0;"
+      "window.domAutomationController.send(hasText ? %d : %d);",
+      text.c_str(), SecurityInterstitialPage::CMD_TEXT_FOUND,
+      SecurityInterstitialPage::CMD_TEXT_NOT_FOUND);
+  int result = 0;
+  EXPECT_TRUE(content::ExecuteScriptAndExtractInt(interstitial->GetMainFrame(),
+                                                  command, &result));
+  return result == SecurityInterstitialPage::CMD_TEXT_FOUND;
+}
+
+void SecurityInterstitialIDNTest::SetUpOnMainThread() {
+  // Clear AcceptLanguages to force punycode decoding.
+  browser()->profile()->GetPrefs()->SetString(prefs::kAcceptLanguages,
+                                              std::string());
+}
+
+testing::AssertionResult SecurityInterstitialIDNTest::VerifyIDNDecoded() const {
+  const char kHostname[] = "xn--d1abbgf6aiiy.xn--p1ai";
+  const char kHostnameJSUnicode[] =
+      "\\u043f\\u0440\\u0435\\u0437\\u0438\\u0434\\u0435\\u043d\\u0442."
+      "\\u0440\\u0444";
+  std::string request_url_spec = base::StringPrintf("https://%s/", kHostname);
+  GURL request_url(request_url_spec);
+
+  content::WebContents* contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  DCHECK(contents);
+  SecurityInterstitialPage* blocking_page =
+      CreateInterstitial(contents, request_url);
+  blocking_page->Show();
+
+  WaitForInterstitialAttach(contents);
+  if (!WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()))
+    return testing::AssertionFailure() << "Render frame not ready";
+
+  if (IsInterstitialDisplayingText(contents->GetInterstitialPage(),
+                                   kHostnameJSUnicode)) {
+    return testing::AssertionSuccess();
+  } else {
+    return testing::AssertionFailure() << "Interstitial not displaying text";

[meacer, 2015/03/25 01:08:40]

Not: You can remove |else| block and just return directly as a fallthrough.

[estark, 2015/03/25 04:23:49]

Done.

+  }
+}
+}  // namespace chrome_browser_interstitials