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

Unified Diff: chrome/browser/extensions/extension_service_unittest.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/extensions/api/tabs/tabs_test.cc ('k') | chrome/browser/plugins/plugin_metadata.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 46d7411ab21cbbf7fe1f1635276d2e3ebf254c00..0ae04bb19c6e263044c05e6220838fe94ab123d6 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -22,6 +22,7 @@
#include "base/prefs/scoped_user_pref_update.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
+#include "base/strings/pattern.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -1379,22 +1380,22 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectoryFail) {
ASSERT_EQ(4u, GetErrors().size());
ASSERT_EQ(0u, loaded_.size());
- EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[0]),
+ EXPECT_TRUE(base::MatchPattern(base::UTF16ToUTF8(GetErrors()[0]),
l10n_util::GetStringUTF8(IDS_EXTENSIONS_LOAD_ERROR_MESSAGE) + " *. " +
extensions::manifest_errors::kManifestUnreadable)) <<
base::UTF16ToUTF8(GetErrors()[0]);
- EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[1]),
+ EXPECT_TRUE(base::MatchPattern(base::UTF16ToUTF8(GetErrors()[1]),
l10n_util::GetStringUTF8(IDS_EXTENSIONS_LOAD_ERROR_MESSAGE) + " *. " +
extensions::manifest_errors::kManifestUnreadable)) <<
base::UTF16ToUTF8(GetErrors()[1]);
- EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[2]),
+ EXPECT_TRUE(base::MatchPattern(base::UTF16ToUTF8(GetErrors()[2]),
l10n_util::GetStringUTF8(IDS_EXTENSIONS_LOAD_ERROR_MESSAGE) + " *. " +
extensions::manifest_errors::kMissingFile)) <<
base::UTF16ToUTF8(GetErrors()[2]);
- EXPECT_TRUE(MatchPattern(base::UTF16ToUTF8(GetErrors()[3]),
+ EXPECT_TRUE(base::MatchPattern(base::UTF16ToUTF8(GetErrors()[3]),
l10n_util::GetStringUTF8(IDS_EXTENSIONS_LOAD_ERROR_MESSAGE) + " *. " +
extensions::manifest_errors::kManifestUnreadable)) <<
base::UTF16ToUTF8(GetErrors()[3]);
« no previous file with comments | « chrome/browser/extensions/api/tabs/tabs_test.cc ('k') | chrome/browser/plugins/plugin_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698