chrome/browser/extensions/api/browsing_data/browsing_data_test.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: chrome/browser/extensions/api/browsing_data/browsing_data_test.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 | « chrome/browser/chromeos/customization/customization_document.cc ('k') | chrome/browser/extensions/api/management/management_api_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

diff --git a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

index d4ccdcdf9901e70e64ff1bfa5b025db6cc15387a..b82cc13eabca0b2207d2a2e4e86981dd27b9f452 100644

--- a/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

+++ b/chrome/browser/extensions/api/browsing_data/browsing_data_test.cc

@@ -8,6 +8,7 @@

#include "base/memory/ref_counted.h"

#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_service.h"

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

#include "base/strings/string_util.h"

#include "base/strings/stringprintf.h"

#include "base/values.h"

@@ -243,7 +244,7 @@ class ExtensionBrowsingDataTest : public InProcessBrowserTest {

EXPECT_EQ(NULL, RunFunctionAndReturnSingleResult(

function.get(), args, browser())) << " for " << args;

} else {

- EXPECT_TRUE(MatchPattern(

+ EXPECT_TRUE(base::MatchPattern(

RunFunctionAndReturnError(function.get(), args, browser()),

extension_browsing_data_api_constants::kDeleteProhibitedError))

<< " for " << args;

@@ -263,10 +264,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowsingDataTest, OneAtATime) {

BrowsingDataRemover::set_removing(true);

scoped_refptr<BrowsingDataRemoveFunction> function =

new BrowsingDataRemoveFunction();

- EXPECT_TRUE(

- MatchPattern(RunFunctionAndReturnError(

- function.get(), kRemoveEverythingArguments, browser()),

- extension_browsing_data_api_constants::kOneAtATimeError));

+ EXPECT_TRUE(base::MatchPattern(

+ RunFunctionAndReturnError(function.get(), kRemoveEverythingArguments,

+ browser()),

+ extension_browsing_data_api_constants::kOneAtATimeError));

BrowsingDataRemover::set_removing(false);

EXPECT_EQ(base::Time(), GetBeginTime());