Add a dcheck to make sure that RenderProcessHost::AllHostsIterator is called on the UI thread.

Review URL: http://codereview.chromium.org/6720051

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80795 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 1 deletions

diff --git a/content/browser/renderer_host/render_process_host.cc b/content/browser/renderer_host/render_process_host.cc
index 25188d2..cf380ab 100644
--- a/content/browser/renderer_host/render_process_host.cc
+++ b/content/browser/renderer_host/render_process_host.cc
@@ -156,6 +156,7 @@ bool RenderProcessHost::FastShutdownForPageCount(size_t count) {
 
 // static
 RenderProcessHost::iterator RenderProcessHost::AllHostsIterator() {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return iterator(&all_hosts);
 }
 
diff --git a/content/browser/site_instance_unittest.cc b/content/browser/site_instance_unittest.cc
index 5ba3919..24b7cd3 100644
--- a/content/browser/site_instance_unittest.cc
+++ b/content/browser/site_instance_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_profile.h"
+#include "content/browser/browser_thread.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/content_browser_client.h"
@@ -50,7 +51,9 @@ class SiteInstanceTestBrowserClient : public content::ContentBrowserClient {
 
 class SiteInstanceTest : public testing::Test {
  public:
-  SiteInstanceTest() : old_browser_client_(NULL) {
+  SiteInstanceTest()
+      : ui_thread_(BrowserThread::UI, &message_loop_),
+        old_browser_client_(NULL) {
   }
 
   virtual void SetUp() {
@@ -64,6 +67,7 @@ class SiteInstanceTest : public testing::Test {
 
  private:
   MessageLoopForUI message_loop_;
+  BrowserThread ui_thread_;
 
   SiteInstanceTestBrowserClient browser_client_;
   content::ContentBrowserClient* old_browser_client_;