Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

chrome/renderer/searchbox_extension.cc

Index: chrome/renderer/searchbox_extension.cc
===================================================================
--- chrome/renderer/searchbox_extension.cc	(revision 79652)
+++ chrome/renderer/searchbox_extension.cc	(working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -11,8 +11,8 @@
 #include "base/string_split.h"
 #include "base/stringprintf.h"
 #include "chrome/common/render_messages_params.h"
+#include "chrome/renderer/render_view_wrapper.h"
 #include "chrome/renderer/searchbox.h"
-#include "content/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScriptSource.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
@@ -133,7 +133,7 @@
       v8::Handle<v8::String> name);
 
   // Helper function to find the RenderView. May return NULL.
-  static RenderView* GetRenderView();
+  static RenderViewWrapper* GetRenderViewWrapper();
 
   // Gets the value of the user's search query.
   static v8::Handle<v8::Value> GetValue(const v8::Arguments& args);
@@ -198,7 +198,7 @@
 }
 
 // static
-RenderView* SearchBoxExtensionWrapper::GetRenderView() {
+RenderViewWrapper* SearchBoxExtensionWrapper::GetRenderViewWrapper() {
   WebFrame* webframe = WebFrame::frameForEnteredContext();
   DCHECK(webframe) << "There should be an active frame since we just got "
       "a native function called.";
@@ -207,74 +207,74 @@
   WebView* webview = webframe->view();
   if (!webview) return NULL;  // can happen during closing
 
-  return RenderView::FromWebView(webview);
+  return RenderViewWrapper::FromWebView(webview);
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetValue(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
   return v8::String::New(
       reinterpret_cast<const uint16_t*>(
-          render_view->searchbox()->value().c_str()),
-      render_view->searchbox()->value().length());
+          render_view_wrapper->searchbox()->value().c_str()),
+      render_view_wrapper->searchbox()->value().length());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetVerbatim(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Boolean::New(render_view->searchbox()->verbatim());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Boolean::New(render_view_wrapper->searchbox()->verbatim());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetSelectionStart(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->selection_start());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->selection_start());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetSelectionEnd(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->selection_end());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->selection_end());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetX(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().x());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().x());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetY(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().y());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().y());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetWidth(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().width());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().width());
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetHeight(
     const v8::Arguments& args) {
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
-  return v8::Int32::New(render_view->searchbox()->rect().height());
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
+  return v8::Int32::New(render_view_wrapper->searchbox()->rect().height());
 }
 
 // Accepts a single argument in form:
@@ -342,8 +342,8 @@
     }
   }
 
-  if (RenderView* render_view = GetRenderView())
-    render_view->searchbox()->SetSuggestions(suggestions, behavior);
+  if (RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper())
+    render_view_wrapper->searchbox()->SetSuggestions(suggestions, behavior);
   return v8::Undefined();
 }