Commit 6a258b77 authored by Christoph Schwering's avatar Christoph Schwering Committed by Commit Bot

Renamed variable for style compliance.

Bug: 1051504
Change-Id: I614f91e530c25284d90e92763d6f2a6af79bb28b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056825
Commit-Queue: Mike Dougherty <michaeldo@chromium.org>
Reviewed-by: default avatarMike Dougherty <michaeldo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741752}
parent 5fb095c1
...@@ -43,10 +43,10 @@ GURL WebUIPageUrlWithHost(const std::string& host) { ...@@ -43,10 +43,10 @@ GURL WebUIPageUrlWithHost(const std::string& host) {
return GURL(base::StringPrintf("%s://%s", kChromeUIScheme, host.c_str())); return GURL(base::StringPrintf("%s://%s", kChromeUIScheme, host.c_str()));
} }
// Waits for omnibox text to equal (if |exactMatch|) or contain (else) |URL| // Waits for omnibox text to equal (if |exact_match|) or contain (else) |URL|
// and returns true if it was found or false on timeout. Strips trailing URL // and returns true if it was found or false on timeout. Strips trailing URL
// slash if present as the omnibox does not display them. // slash if present as the omnibox does not display them.
bool WaitForOmniboxURLString(std::string URL, bool exactMatch = true) { bool WaitForOmniboxURLString(std::string URL, bool exact_match = true) {
const std::string trimmed_URL = const std::string trimmed_URL =
base::TrimString(URL, "/", TrimPositions::TRIM_TRAILING).as_string(); base::TrimString(URL, "/", TrimPositions::TRIM_TRAILING).as_string();
...@@ -55,7 +55,7 @@ bool WaitForOmniboxURLString(std::string URL, bool exactMatch = true) { ...@@ -55,7 +55,7 @@ bool WaitForOmniboxURLString(std::string URL, bool exactMatch = true) {
return base::test::ios::WaitUntilConditionOrTimeout( return base::test::ios::WaitUntilConditionOrTimeout(
base::test::ios::kWaitForUIElementTimeout, ^{ base::test::ios::kWaitForUIElementTimeout, ^{
NSError* error = nil; NSError* error = nil;
if (exactMatch) { if (exact_match) {
[[EarlGrey selectElementWithMatcher:OmniboxText(trimmed_URL)] [[EarlGrey selectElementWithMatcher:OmniboxText(trimmed_URL)]
assertWithMatcher:grey_notNil() assertWithMatcher:grey_notNil()
error:&error]; error:&error];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment