summaryrefslogtreecommitdiffstats
path: root/chrome/test/base/ui_test_utils.cc
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 17:22:02 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-24 17:22:02 +0000
commitd512dbb472967d13c0cfc4223fd463b1b417fc45 (patch)
tree477aef119fd521a78ee99a472b0041605b5e419b /chrome/test/base/ui_test_utils.cc
parente61003a297e2959658fbf764b3b7db51a223e4c8 (diff)
downloadchromium_src-d512dbb472967d13c0cfc4223fd463b1b417fc45.zip
chromium_src-d512dbb472967d13c0cfc4223fd463b1b417fc45.tar.gz
chromium_src-d512dbb472967d13c0cfc4223fd463b1b417fc45.tar.bz2
Revert 138812 - Move render_view_host_delegate.h out of content/public.
BUG=98716 Review URL: https://chromiumcodereview.appspot.com/10441019 TBR=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/10450018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/base/ui_test_utils.cc')
-rw-r--r--chrome/test/base/ui_test_utils.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/base/ui_test_utils.cc b/chrome/test/base/ui_test_utils.cc
index fb7c02b..312bee4 100644
--- a/chrome/test/base/ui_test_utils.cc
+++ b/chrome/test/base/ui_test_utils.cc
@@ -55,6 +55,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
+#include "content/public/browser/render_view_host_delegate.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_view.h"
@@ -99,7 +100,7 @@ class DOMOperationObserver : public content::NotificationObserver,
public:
explicit DOMOperationObserver(RenderViewHost* render_view_host)
: content::WebContentsObserver(
- WebContents::FromRenderViewHost(render_view_host)),
+ render_view_host->GetDelegate()->GetAsWebContents()),
did_respond_(false) {
registrar_.Add(this, content::NOTIFICATION_DOM_OPERATION_RESPONSE,
content::Source<RenderViewHost>(render_view_host));