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

Unified Diff: content/browser/browser_url_handler_unittest.cc

Issue 7708010: Add more files to content_unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: virtual dtor Created 9 years, 4 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
Index: content/browser/browser_url_handler_unittest.cc
diff --git a/content/browser/browser_url_handler_unittest.cc b/content/browser/browser_url_handler_unittest.cc
index f6af8ec00bd3b1071d49e1aa984c46011dba1c5b..ed133a23b24f6f051f0455cb5799174b0a3cfb87 100644
--- a/content/browser/browser_url_handler_unittest.cc
+++ b/content/browser/browser_url_handler_unittest.cc
@@ -2,13 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/test/base/testing_browser_process_test.h"
-#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_url_handler.h"
+#include "content/test/test_browser_context.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
-class BrowserURLHandlerTest : public TestingBrowserProcessTest {
+class BrowserURLHandlerTest : public testing::Test {
};
// Test URL rewriter that rewrites all "foo://" URLs to "bar://bar".
@@ -30,7 +29,7 @@ static bool BarRewriter(GURL* url, content::BrowserContext* browser_context) {
}
TEST_F(BrowserURLHandlerTest, BasicRewriteAndReverse) {
- TestingProfile profile;
+ TestBrowserContext browser_context;
BrowserURLHandler handler;
handler.AddHandlerPair(FooRewriter, BarRewriter);
@@ -38,38 +37,42 @@ TEST_F(BrowserURLHandlerTest, BasicRewriteAndReverse) {
GURL url("foo://bar");
GURL original_url(url);
bool reverse_on_redirect = false;
- handler.RewriteURLIfNecessary(&url, &profile, &reverse_on_redirect);
+ handler.RewriteURLIfNecessary(&url, &browser_context, &reverse_on_redirect);
ASSERT_TRUE(reverse_on_redirect);
ASSERT_EQ("bar://bar", url.spec());
// Check that reversing the URL works.
GURL saved_url(url);
- bool reversed = handler.ReverseURLRewrite(&url, original_url, &profile);
+ bool reversed = handler.ReverseURLRewrite(&url,
+ original_url,
+ &browser_context);
ASSERT_TRUE(reversed);
ASSERT_EQ("foo://foo", url.spec());
// Check that reversing the URL only works with a matching |original_url|.
url = saved_url;
original_url = GURL("bam://bam"); // Won't be matched by FooRewriter.
- reversed = handler.ReverseURLRewrite(&url, original_url, &profile);
+ reversed = handler.ReverseURLRewrite(&url, original_url, &browser_context);
ASSERT_FALSE(reversed);
ASSERT_EQ(saved_url, url);
}
TEST_F(BrowserURLHandlerTest, NullHandlerReverse) {
- TestingProfile profile;
+ TestBrowserContext browser_context;
BrowserURLHandler handler;
GURL url("bar://foo");
GURL original_url(url);
handler.AddHandlerPair(BrowserURLHandler::null_handler(), FooRewriter);
- bool reversed = handler.ReverseURLRewrite(&url, original_url, &profile);
+ bool reversed = handler.ReverseURLRewrite(&url,
+ original_url,
+ &browser_context);
ASSERT_FALSE(reversed);
ASSERT_EQ(original_url, url);
handler.AddHandlerPair(BrowserURLHandler::null_handler(), BarRewriter);
- reversed = handler.ReverseURLRewrite(&url, original_url, &profile);
+ reversed = handler.ReverseURLRewrite(&url, original_url, &browser_context);
ASSERT_TRUE(reversed);
ASSERT_EQ("foo://foo", url.spec());
}
« no previous file with comments | « content/browser/appcache/chrome_appcache_service_unittest.cc ('k') | content/browser/content_browser_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698