Make commands consistent across security interstitials

chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

 // 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/ssl/captive_portal_blocking_page.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 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);",
       text.c_str());
-  bool result = false;
-  EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
+  int result = 0;
+  EXPECT_EQ(1, content::ExecuteScriptAndExtractInt(

[meacer, 2015/03/07 07:50:59]

EXPECT_TRUE(content::ExecuteScriptAndExtractInt(...

instead.

       interstitial->GetMainFrame(), command, &result));
-  return result;
+  return result == 1;
 }
 
 enum ExpectWiFi {
   EXPECT_WIFI_NO,
   EXPECT_WIFI_YES
 };
 
 enum ExpectWiFiSSID {
   EXPECT_WIFI_SSID_NO,
   EXPECT_WIFI_SSID_YES
@@ skipping 181 matching lines @@
   const char kHostnameJSUnicode[] =
       "\\u043f\\u0440\\u0435\\u0437\\u0438\\u0434\\u0435\\u043d\\u0442."
       "\\u0440\\u0444";
   std::string landing_url_spec =
       base::StringPrintf("http://%s/landing_url", kHostname);
   GURL landing_url(landing_url_spec);
 
   TestInterstitial(false, "", landing_url, EXPECT_WIFI_NO, EXPECT_WIFI_SSID_NO,
                    EXPECT_LOGIN_URL_YES, kHostnameJSUnicode);
 }