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

Unified Diff: extensions/utility/unpacker_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 | « extensions/shell/common/shell_content_client_unittest.cc ('k') | media/filters/stream_parser_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/utility/unpacker_unittest.cc
diff --git a/extensions/utility/unpacker_unittest.cc b/extensions/utility/unpacker_unittest.cc
index b323e01eed50aa12f1ddd34133c347af19761692..bb99aaeed246a6d4a279e24bf213019abdb67626 100644
--- a/extensions/utility/unpacker_unittest.cc
+++ b/extensions/utility/unpacker_unittest.cc
@@ -5,6 +5,7 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/path_service.h"
+#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -80,11 +81,11 @@ TEST_F(UnpackerTest, InvalidDefaultLocale) {
TEST_F(UnpackerTest, InvalidMessagesFile) {
SetupUnpacker("invalid_messages_file.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_TRUE(
- MatchPattern(unpacker_->error_message(),
- ASCIIToUTF16(
- "*_locales?en_US?messages.json: Line: 2, column: 11,"
- " Syntax error.")))
+ EXPECT_TRUE(base::MatchPattern(
+ unpacker_->error_message(),
+ ASCIIToUTF16(
+ "*_locales?en_US?messages.json: Line: 2, column: 11,"
+ " Syntax error.")))
<< unpacker_->error_message();
}
@@ -105,9 +106,10 @@ TEST_F(UnpackerTest, MissingDefaultLocaleHasLocalesFolder) {
TEST_F(UnpackerTest, MissingMessagesFile) {
SetupUnpacker("missing_messages_file.crx");
EXPECT_FALSE(unpacker_->Run());
- EXPECT_TRUE(MatchPattern(unpacker_->error_message(),
- ASCIIToUTF16(errors::kLocalesMessagesFileMissing) +
- ASCIIToUTF16("*_locales?en_US?messages.json")));
+ EXPECT_TRUE(
+ base::MatchPattern(unpacker_->error_message(),
+ ASCIIToUTF16(errors::kLocalesMessagesFileMissing) +
+ ASCIIToUTF16("*_locales?en_US?messages.json")));
}
TEST_F(UnpackerTest, NoLocaleData) {
« no previous file with comments | « extensions/shell/common/shell_content_client_unittest.cc ('k') | media/filters/stream_parser_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698