summaryrefslogtreecommitdiffstats
path: root/chrome/browser/visitedlink
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 23:49:14 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-25 23:49:14 +0000
commit8243c186a0fc264d187a41981402711b672ec54b (patch)
treea7df28594621125b3ec7a9a3b1d0d9fcdc7a4c0c /chrome/browser/visitedlink
parent4fc7baba80b0df795c3438bd351029645a33d609 (diff)
downloadchromium_src-8243c186a0fc264d187a41981402711b672ec54b.zip
chromium_src-8243c186a0fc264d187a41981402711b672ec54b.tar.gz
chromium_src-8243c186a0fc264d187a41981402711b672ec54b.tar.bz2
Add DCHECK to make sure that RenderProcessHost::FromID (which is also called by RenderViewHost::FromID) is called on the UI thread. Also fix NotificationObjectProxy using RenderProcessHost on the IO thread.
Review URL: http://codereview.chromium.org/6599008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/visitedlink')
-rw-r--r--chrome/browser/visitedlink/visitedlink_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc
index af957ce..dd7aa83 100644
--- a/chrome/browser/visitedlink/visitedlink_unittest.cc
+++ b/chrome/browser/visitedlink/visitedlink_unittest.cc
@@ -12,13 +12,13 @@
#include "base/process_util.h"
#include "base/shared_memory.h"
#include "base/string_util.h"
-#include "chrome/browser/browser_thread.h"
#include "chrome/browser/renderer_host/browser_render_process_host.h"
#include "chrome/browser/visitedlink/visitedlink_master.h"
#include "chrome/browser/visitedlink/visitedlink_event_listener.h"
#include "chrome/common/render_messages.h"
#include "chrome/renderer/visitedlink_slave.h"
#include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/test_render_view_host.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -583,6 +583,7 @@ class VisitedLinkEventsTest : public RenderViewHostTestHarness {
public:
VisitedLinkEventsTest()
: RenderViewHostTestHarness(),
+ ui_thread_(BrowserThread::UI, &message_loop_),
file_thread_(BrowserThread::FILE, &message_loop_) {}
~VisitedLinkEventsTest() {
// This ends up using the file thread to schedule the delete.
@@ -614,6 +615,7 @@ class VisitedLinkEventsTest : public RenderViewHostTestHarness {
private:
scoped_ptr<VisitedLinkEventListener> event_listener_;
+ BrowserThread ui_thread_;
BrowserThread file_thread_;
DISALLOW_COPY_AND_ASSIGN(VisitedLinkEventsTest);