summaryrefslogtreecommitdiffstats
path: root/content/browser/browser_url_handler_impl_unittest.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:44:52 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:44:52 +0000
commit7a91c555f3e057f8be9010a4e5385678ce822c28 (patch)
treeedb8a4384b09b3ce70b6b58a17afe5470eb5e039 /content/browser/browser_url_handler_impl_unittest.cc
parente2e22a7ab44c2f49d856a9f840893c5462f52679 (diff)
downloadchromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.zip
chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.gz
chromium_src-7a91c555f3e057f8be9010a4e5385678ce822c28.tar.bz2
content/browser: Move more files into the content namespace.
Fixed most of the files found with the following command line: $ git grep --files-without-match --name-only "namespace content {" -- content/browser/{*.cc,*.h.*.mm} R=jam@chromium.org Review URL: https://codereview.chromium.org/11274038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_url_handler_impl_unittest.cc')
-rw-r--r--content/browser/browser_url_handler_impl_unittest.cc21
1 files changed, 13 insertions, 8 deletions
diff --git a/content/browser/browser_url_handler_impl_unittest.cc b/content/browser/browser_url_handler_impl_unittest.cc
index de2228e..de90aac 100644
--- a/content/browser/browser_url_handler_impl_unittest.cc
+++ b/content/browser/browser_url_handler_impl_unittest.cc
@@ -7,11 +7,12 @@
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-class BrowserURLHandlerImplTest : public testing::Test {
-};
+namespace content {
+
+namespace {
// Test URL rewriter that rewrites all "foo://" URLs to "bar://bar".
-static bool FooRewriter(GURL* url, content::BrowserContext* browser_context) {
+bool FooRewriter(GURL* url, BrowserContext* browser_context) {
if (url->scheme() == "foo") {
*url = GURL("bar://bar");
return true;
@@ -20,7 +21,7 @@ static bool FooRewriter(GURL* url, content::BrowserContext* browser_context) {
}
// Test URL rewriter that rewrites all "bar://" URLs to "foo://foo".
-static bool BarRewriter(GURL* url, content::BrowserContext* browser_context) {
+bool BarRewriter(GURL* url, BrowserContext* browser_context) {
if (url->scheme() == "bar") {
*url = GURL("foo://foo");
return true;
@@ -28,8 +29,10 @@ static bool BarRewriter(GURL* url, content::BrowserContext* browser_context) {
return false;
}
-TEST_F(BrowserURLHandlerImplTest, BasicRewriteAndReverse) {
- content::TestBrowserContext browser_context;
+} // namespace
+
+TEST(BrowserURLHandlerImplTest, BasicRewriteAndReverse) {
+ TestBrowserContext browser_context;
BrowserURLHandlerImpl handler;
handler.AddHandlerPair(FooRewriter, BarRewriter);
@@ -57,8 +60,8 @@ TEST_F(BrowserURLHandlerImplTest, BasicRewriteAndReverse) {
ASSERT_EQ(saved_url, url);
}
-TEST_F(BrowserURLHandlerImplTest, NullHandlerReverse) {
- content::TestBrowserContext browser_context;
+TEST(BrowserURLHandlerImplTest, NullHandlerReverse) {
+ TestBrowserContext browser_context;
BrowserURLHandlerImpl handler;
GURL url("bar://foo");
@@ -76,3 +79,5 @@ TEST_F(BrowserURLHandlerImplTest, NullHandlerReverse) {
ASSERT_TRUE(reversed);
ASSERT_EQ("foo://foo", url.spec());
}
+
+} // namespace content