Fix JavaBridgeDispatcherHost to use WebContents rather than TabContents

BUG=110637

Review URL: https://chromiumcodereview.appspot.com/9251022

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

2 files changed, 8 insertions, 9 deletions

diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
index 34193e0..45bef2e 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,12 +6,11 @@
 
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host.h"
-#include "content/browser/tab_contents/tab_contents.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 
 JavaBridgeDispatcherHostManager::JavaBridgeDispatcherHostManager(
-    TabContents* tab_contents)
-    : content::WebContentsObserver(tab_contents) {
+    content::WebContents* web_contents)
+    : content::WebContentsObserver(web_contents) {
 }
 
 JavaBridgeDispatcherHostManager::~JavaBridgeDispatcherHostManager() {
@@ -70,7 +69,7 @@ void JavaBridgeDispatcherHostManager::RenderViewDeleted(
 
 void JavaBridgeDispatcherHostManager::WebContentsDestroyed(
     content::WebContents* web_contents) {
-  // When the tab is shutting down, the TabContents clears its observers before
+  // When the tab is shutting down, the WebContents clears its observers before
   // it kills all of its RenderViewHosts, so we won't get a call to
   // RenderViewDeleted() for all RenderViewHosts.
   instances_.clear();
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h
index ff77019..bc5139b 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -18,11 +18,11 @@ class RenderViewHost;
 struct NPObject;
 
 // This class handles injecting Java objects into all of the RenderViews
-// associated with a TabContents. It manages a set of JavaBridgeDispatcherHost
+// associated with a WebContents. It manages a set of JavaBridgeDispatcherHost
 // objects, one per RenderViewHost.
 class JavaBridgeDispatcherHostManager : public content::WebContentsObserver {
  public:
-  JavaBridgeDispatcherHostManager(TabContents* tab_contents);
+  JavaBridgeDispatcherHostManager(content::WebContents* web_contents);
   virtual ~JavaBridgeDispatcherHostManager();
 
   // These methods add or remove the object to each JavaBridgeDispatcherHost.
@@ -35,7 +35,7 @@ class JavaBridgeDispatcherHostManager : public content::WebContentsObserver {
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE;
   virtual void WebContentsDestroyed(
-      content::WebContents* tab_contents) OVERRIDE;
+      content::WebContents* web_contents) OVERRIDE;
 
  private:
   typedef std::map<RenderViewHost*, scoped_refptr<JavaBridgeDispatcherHost> >