content/browser/site_per_process_browsertest.cc - Issue 1226673003: Move MatchPattern to its own header and the base namespace.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/site_per_process_browsertest.cc

Issue 1226673003: Move MatchPattern to its own header and the base namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 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

« no previous file with comments | « content/browser/accessibility/accessibility_tree_formatter.cc ('k') | content/browser/tracing/background_tracing_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/site_per_process_browsertest.cc

diff --git a/content/browser/site_per_process_browsertest.cc b/content/browser/site_per_process_browsertest.cc

index dc1fb4a1464d00670081ce02e187e367fc835882..36ee7b0ea6a129ae8e209f7b98955fa62126150f 100644

--- a/content/browser/site_per_process_browsertest.cc

+++ b/content/browser/site_per_process_browsertest.cc

@@ -10,6 +10,7 @@

#include "base/command_line.h"

#include "base/location.h"

#include "base/single_thread_task_runner.h"

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

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "base/thread_task_runner_handle.h"

@@ -247,7 +248,7 @@ bool ConsoleObserverDelegate::AddMessageToConsole(

DCHECK(source == web_contents_);

std::string ascii_message = base::UTF16ToASCII(message);

- if (MatchPattern(ascii_message, filter_)) {

+ if (base::MatchPattern(ascii_message, filter_)) {

message_ = ascii_message;

message_loop_runner_->Quit();

}

@@ -2308,7 +2309,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, OriginUpdatesReachProxies) {

root->child_at(1)->current_replication_state().origin.string();

EXPECT_EQ(frame_origin + "/", frame_url.GetOrigin().spec());

EXPECT_TRUE(

- MatchPattern(console_delegate->message(), "*" + frame_origin + "*"))

+ base::MatchPattern(console_delegate->message(), "*" + frame_origin + "*"))

<< "Error message does not contain the frame's latest origin ("

<< frame_origin << ")";

}