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

Unified Diff: chrome/browser/visitedlink/visitedlink_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: updates 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/visitedlink/visitedlink_unittest.cc
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index 3d5d59e1163e532da4a3a4929f8255a5c2bef517..8649996ee86752239366a7aa30d2569851657749 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -16,10 +16,10 @@
#include "chrome/browser/visitedlink/visitedlink_event_listener.h"
#include "chrome/common/render_messages.h"
#include "chrome/renderer/visitedlink_slave.h"
+#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "chrome/test/base/testing_profile.h"
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/browser_render_process_host.h"
-#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/common/notification_service.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -563,28 +563,24 @@ class VisitedLinkRenderProcessHostFactory
DISALLOW_COPY_AND_ASSIGN(VisitedLinkRenderProcessHostFactory);
};
-class VisitedLinkEventsTest : public RenderViewHostTestHarness {
+class VisitedLinkEventsTest : public ChromeRenderViewHostTestHarness {
public:
VisitedLinkEventsTest()
- : RenderViewHostTestHarness(),
+ : ChromeRenderViewHostTestHarness(),
Paweł Hajdan Jr. 2011/09/13 19:16:36 nit: Needed?
ui_thread_(BrowserThread::UI, &message_loop_),
file_thread_(BrowserThread::FILE, &message_loop_) {}
- ~VisitedLinkEventsTest() {
- // This ends up using the file thread to schedule the delete.
- profile_.reset();
- message_loop_.RunAllPending();
- }
+ virtual ~VisitedLinkEventsTest() {}
virtual void SetFactoryMode() {}
virtual void SetUp() {
SetFactoryMode();
event_listener_.reset(new VisitedLinkEventListener());
rvh_factory_.set_render_process_host_factory(&vc_rph_factory_);
- profile_.reset(new VisitCountingProfile(event_listener_.get()));
- RenderViewHostTestHarness::SetUp();
+ browser_context_.reset(new VisitCountingProfile(event_listener_.get()));
+ ChromeRenderViewHostTestHarness::SetUp();
}
VisitCountingProfile* profile() const {
- return static_cast<VisitCountingProfile*>(profile_.get());
+ return static_cast<VisitCountingProfile*>(browser_context_.get());
}
void WaitForCoalescense() {
@@ -607,7 +603,7 @@ class VisitedLinkEventsTest : public RenderViewHostTestHarness {
TEST_F(VisitedLinkEventsTest, Coalescense) {
// add some URLs to master.
- VisitedLinkMaster* master = profile_->GetVisitedLinkMaster();
+ VisitedLinkMaster* master = profile()->GetVisitedLinkMaster();
// Add a few URLs.
master->AddURL(GURL("http://acidtests.org/"));
master->AddURL(GURL("http://google.com/"));
@@ -659,7 +655,7 @@ TEST_F(VisitedLinkEventsTest, Coalescense) {
}
TEST_F(VisitedLinkEventsTest, Basics) {
- VisitedLinkMaster* master = profile_->GetVisitedLinkMaster();
+ VisitedLinkMaster* master = profile()->GetVisitedLinkMaster();
rvh()->CreateRenderView(string16());
// Add a few URLs.
@@ -683,7 +679,7 @@ TEST_F(VisitedLinkEventsTest, Basics) {
}
TEST_F(VisitedLinkEventsTest, TabVisibility) {
- VisitedLinkMaster* master = profile_->GetVisitedLinkMaster();
+ VisitedLinkMaster* master = profile()->GetVisitedLinkMaster();
rvh()->CreateRenderView(string16());
// Simulate tab becoming inactive.

Powered by Google App Engine
This is Rietveld 408576698