diff options
| author | brettw <brettw@chromium.org> | 2015-07-06 15:09:00 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-06 22:10:42 +0000 |
| commit | d97eede0d9eb25ebffc918c8ebfcf9a9d9703a88 (patch) | |
| tree | e83dc87df21704e72e63423961e82b02244ac015 /extensions/utility | |
| parent | 7d47f7a394e09e1a6e3e546932051649f185d47e (diff) | |
| download | chromium_src-d97eede0d9eb25ebffc918c8ebfcf9a9d9703a88.zip chromium_src-d97eede0d9eb25ebffc918c8ebfcf9a9d9703a88.tar.gz chromium_src-d97eede0d9eb25ebffc918c8ebfcf9a9d9703a88.tar.bz2 | |
Move MatchPattern to its own header and the base namespace.
BUG=
Review URL: https://codereview.chromium.org/1226673003
Cr-Commit-Position: refs/heads/master@{#337488}
Diffstat (limited to 'extensions/utility')
| -rw-r--r-- | extensions/utility/unpacker_unittest.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/extensions/utility/unpacker_unittest.cc b/extensions/utility/unpacker_unittest.cc index b323e01..bb99aae 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) { |