chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc - Issue 981243003: Make commands consistent across security interstitials

Unified Diff: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

Issue 981243003: Make commands consistent across security interstitials (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Tests Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('K') | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | chrome/browser/ssl/captive_portal_blocking_page.cc » ('j') | chrome/browser/ssl/ssl_blocking_page.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

index bd22f4b5a682c77a79bba079832adc5460c3d825..e3bdeaf6d55a9cfaede1ed8316767309225ed435 100644

--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_test.cc

@@ -9,6 +9,7 @@

#include "base/bind.h"

#include "base/command_line.h"

#include "base/prefs/pref_service.h"

+#include "base/strings/string_number_conversions.h"

#include "base/strings/utf_string_conversions.h"

#include "base/values.h"

#include "chrome/browser/browser_process.h"

@@ -400,7 +401,7 @@ class SafeBrowsingBlockingPageBrowserTest

return url;

}

- void SendCommand(const std::string& command) {

+ void SendCommand(int command) {

Bernhard Bauer 2015/03/11 08:42:14 You could use the enum type here, and then maybe t

felt 2015/03/11 15:25:09 Done.

WebContents* contents =

browser()->tab_strip_model()->GetActiveWebContents();

// We use InterstitialPage::GetInterstitialPage(tab) instead of

@@ -415,7 +416,7 @@ class SafeBrowsingBlockingPageBrowserTest

ASSERT_TRUE(interstitial_page);

ASSERT_EQ(SafeBrowsingBlockingPage::kTypeForTesting,

interstitial_page->GetTypeForTesting());

- interstitial_page->CommandReceived(command);

+ interstitial_page->CommandReceived(base::IntToString(command));

}

void DontProceedThroughInterstitial() {

@@ -500,7 +501,7 @@ class SafeBrowsingBlockingPageBrowserTest

// below, and crbug.com/76460), we use SendCommand to trigger the callback

// directly rather than using ClickAndWaitForDetach since there might not

// be a notification to wait for.

- SendCommand("\"proceed\"");

+ SendCommand(SecurityInterstitialPage::CMD_PROCEED);

}

content::RenderViewHost* GetRenderViewHost() {

@@ -732,7 +733,7 @@ IN_PROC_BROWSER_TEST_P(SafeBrowsingBlockingPageBrowserTest, ProceedDisabled) {

EXPECT_TRUE(Click("details-button"));

EXPECT_EQ(HIDDEN, GetVisibility("proceed-link"));

EXPECT_EQ(HIDDEN, GetVisibility("final-paragraph"));

- SendCommand("proceed");

+ SendCommand(SecurityInterstitialPage::CMD_PROCEED);

// The "proceed" command should go back instead, if proceeding is disabled.

AssertNoInterstitial(true);