Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3669)

Unified Diff: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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
Index: chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
diff --git a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
index 45aec0739661ff8155b48e0571669dc09b8f2e27..1cef6080d8c01e416208e45fcff4e673430da596 100644
--- a/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
+++ b/chrome/browser/ssl/captive_portal_blocking_page_browsertest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ssl/captive_portal_blocking_page.h"
#include <string>
+#include <utility>
#include "base/callback.h"
#include "base/logging.h"
@@ -70,7 +71,7 @@ class CaptivePortalBlockingPageForTesting : public CaptivePortalBlockingPage {
: CaptivePortalBlockingPage(web_contents,
request_url,
login_url,
- ssl_cert_reporter.Pass(),
+ std::move(ssl_cert_reporter),
ssl_info,
callback),
is_wifi_(is_wifi),
@@ -136,7 +137,7 @@ void CaptivePortalBlockingPageTest::TestInterstitial(
// Blocking page is owned by the interstitial.
CaptivePortalBlockingPage* blocking_page =
new CaptivePortalBlockingPageForTesting(
- contents, GURL(kBrokenSSL), login_url, ssl_cert_reporter.Pass(),
+ contents, GURL(kBrokenSSL), login_url, std::move(ssl_cert_reporter),
ssl_info, base::Callback<void(bool)>(), is_wifi_connection,
wifi_ssid);
blocking_page->Show();
@@ -181,8 +182,8 @@ void CaptivePortalBlockingPageTest::TestInterstitial(
ExpectLoginURL expect_login_url,
scoped_ptr<SSLCertReporter> ssl_cert_reporter) {
TestInterstitial(is_wifi_connection, wifi_ssid, login_url, expect_wifi,
- expect_wifi_ssid, expect_login_url, ssl_cert_reporter.Pass(),
- login_url.host());
+ expect_wifi_ssid, expect_login_url,
+ std::move(ssl_cert_reporter), login_url.host());
}
void CaptivePortalBlockingPageTest::TestCertReporting(
@@ -201,7 +202,7 @@ void CaptivePortalBlockingPageTest::TestCertReporting(
const GURL kLandingUrl(captive_portal::CaptivePortalDetector::kDefaultURL);
TestInterstitial(true, std::string(), kLandingUrl, EXPECT_WIFI_YES,
EXPECT_WIFI_SSID_NO, EXPECT_LOGIN_URL_NO,
- ssl_cert_reporter.Pass());
+ std::move(ssl_cert_reporter));
EXPECT_EQ(std::string(), GetLatestHostnameReported());

Powered by Google App Engine
This is Rietveld 408576698