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

Unified Diff: chrome/browser/safe_browsing/malware_details_unittest.cc

Issue 7892007: Add ChromeRenderViewHostTestHarness to get rid of the dependency from RVHTH to profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 3 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: chrome/browser/safe_browsing/malware_details_unittest.cc
diff --git a/chrome/browser/safe_browsing/malware_details_unittest.cc b/chrome/browser/safe_browsing/malware_details_unittest.cc
index cca0b05b22200e0accf36a612f7a655610d7baf6..d2fa55c7f39df8d9385fc179e6df4ef1cdcbcef7 100644
--- a/chrome/browser/safe_browsing/malware_details_unittest.cc
+++ b/chrome/browser/safe_browsing/malware_details_unittest.cc
@@ -14,10 +14,10 @@
#include "chrome/browser/safe_browsing/report.pb.h"
#include "chrome/common/render_messages.h"
#include "chrome/common/safe_browsing/safebrowsing_messages.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/test_url_request_context_getter.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
-#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/test_tab_contents.h"
#include "net/base/io_buffer.h"
@@ -164,7 +164,7 @@ class MockSafeBrowsingService : public SafeBrowsingService {
} // namespace.
-class MalwareDetailsTest : public RenderViewHostTestHarness {
+class MalwareDetailsTest : public ChromeRenderViewHostTestHarness {
public:
MalwareDetailsTest()
: ui_thread_(BrowserThread::UI, &message_loop_),
@@ -173,18 +173,18 @@ class MalwareDetailsTest : public RenderViewHostTestHarness {
}
virtual void SetUp() {
- RenderViewHostTestHarness::SetUp();
+ ChromeRenderViewHostTestHarness::SetUp();
// The URLFetcher checks that the messageloop type is IO.
ASSERT_TRUE(io_thread_.StartWithOptions(
base::Thread::Options(MessageLoop::TYPE_IO, 0)));
- profile_->CreateHistoryService(true /* delete_file */, false /* no_db */);
+ profile()->CreateHistoryService(true /* delete_file */, false /* no_db */);
}
virtual void TearDown() {
io_thread_.Stop();
- profile_->DestroyHistoryService();
- RenderViewHostTestHarness::TearDown();
+ profile()->DestroyHistoryService();
+ ChromeRenderViewHostTestHarness::TearDown();
}
static bool ResourceLessThan(
@@ -206,7 +206,7 @@ class MalwareDetailsTest : public RenderViewHostTestHarness {
}
HistoryService* history_service() {
- return profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
+ return profile()->GetHistoryService(Profile::EXPLICIT_ACCESS);
}
protected:
@@ -642,7 +642,7 @@ TEST_F(MalwareDetailsTest, HistoryServiceUrls) {
redirects.push_back(GURL(kSecondRedirectURL));
AddPageToHistory(baseurl, &redirects);
// Wait for history service operation finished.
- profile_->BlockUntilHistoryProcessesPendingRequests();
+ profile()->BlockUntilHistoryProcessesPendingRequests();
controller().LoadURL(GURL(kLandingURL), GURL(), PageTransition::TYPED,
std::string());

Powered by Google App Engine
This is Rietveld 408576698