summaryrefslogtreecommitdiffstats
path: root/extensions/shell
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-07-06 15:09:00 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-06 22:10:42 +0000
commitd97eede0d9eb25ebffc918c8ebfcf9a9d9703a88 (patch)
treee83dc87df21704e72e63423961e82b02244ac015 /extensions/shell
parent7d47f7a394e09e1a6e3e546932051649f185d47e (diff)
downloadchromium_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/shell')
-rw-r--r--extensions/shell/browser/shell_nacl_browser_delegate_unittest.cc5
-rw-r--r--extensions/shell/common/shell_content_client_unittest.cc3
2 files changed, 5 insertions, 3 deletions
diff --git a/extensions/shell/browser/shell_nacl_browser_delegate_unittest.cc b/extensions/shell/browser/shell_nacl_browser_delegate_unittest.cc
index e42fb33..0e1d178 100644
--- a/extensions/shell/browser/shell_nacl_browser_delegate_unittest.cc
+++ b/extensions/shell/browser/shell_nacl_browser_delegate_unittest.cc
@@ -4,6 +4,7 @@
#include "extensions/shell/browser/shell_nacl_browser_delegate.h"
+#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "content/public/test/test_browser_context.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -19,8 +20,8 @@ TEST_F(ShellNaClBrowserDelegateTest, VersionString) {
// Version should look like "1.2.3.4 (5)".
std::string version = delegate.GetVersionString();
- EXPECT_TRUE(MatchPattern(version, "*.*.*.* (*)")) << "bad version "
- << version;
+ EXPECT_TRUE(base::MatchPattern(version, "*.*.*.* (*)")) << "bad version "
+ << version;
}
} // namespace extensions
diff --git a/extensions/shell/common/shell_content_client_unittest.cc b/extensions/shell/common/shell_content_client_unittest.cc
index bf5779f..eb9694d 100644
--- a/extensions/shell/common/shell_content_client_unittest.cc
+++ b/extensions/shell/common/shell_content_client_unittest.cc
@@ -6,6 +6,7 @@
#include <string>
+#include "base/strings/pattern.h"
#include "base/strings/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -23,7 +24,7 @@ TEST_F(ShellContentClientTest, UserAgentFormat) {
<< user_agent;
// Must contain a substring like "Chrome/1.2.3.4".
- EXPECT_TRUE(MatchPattern(user_agent, "*Chrome/*.*.*.*")) << user_agent;
+ EXPECT_TRUE(base::MatchPattern(user_agent, "*Chrome/*.*.*.*")) << user_agent;
}
} // namespace extensions