Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

chrome/renderer/search_extension.cc

Index: chrome/renderer/search_extension.cc
===================================================================
--- chrome/renderer/search_extension.cc	(revision 79652)
+++ chrome/renderer/search_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.
 
@@ -9,6 +9,7 @@
 
 #include "base/command_line.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"
@@ -30,8 +31,8 @@
   virtual v8::Handle<v8::FunctionTemplate> GetNativeFunction(
       v8::Handle<v8::String> name);
 
-  // Helper function to find the RenderView. May return NULL.
-  static RenderView* GetRenderView();
+  // Helper function to find the RenderViewWrapper. May return NULL.
+  static RenderViewWrapper* GetRenderViewWrapper();
 
   // Implementation of window.chrome.setSuggestResult.
   static v8::Handle<v8::Value> SetSuggestResult(const v8::Arguments& args);
@@ -61,7 +62,7 @@
 }
 
 // static
-RenderView* SearchExtensionWrapper::GetRenderView() {
+RenderViewWrapper* SearchExtensionWrapper::GetRenderViewWrapper() {
   WebFrame* webframe = WebFrame::frameForEnteredContext();
   DCHECK(webframe) << "There should be an active frame since we just got "
       "a native function called.";
@@ -70,7 +71,7 @@
   WebView* webview = webframe->view();
   if (!webview) return NULL;  // can happen during closing
 
-  return RenderView::FromWebView(webview);
+  return RenderViewWrapper::FromWebView(webview);
 }
 
 // static
@@ -78,12 +79,13 @@
     const v8::Arguments& args) {
   if (!args.Length() || !args[0]->IsString()) return v8::Undefined();
 
-  RenderView* render_view = GetRenderView();
-  if (!render_view) return v8::Undefined();
+  RenderViewWrapper* render_view_wrapper = GetRenderViewWrapper();
+  if (!render_view_wrapper) return v8::Undefined();
 
   std::vector<std::string> suggestions;
   suggestions.push_back(std::string(*v8::String::Utf8Value(args[0])));
-  render_view->searchbox()->SetSuggestions(suggestions, INSTANT_COMPLETE_NOW);
+  render_view_wrapper->searchbox()->SetSuggestions(suggestions,
+                                                   INSTANT_COMPLETE_NOW);
   return v8::Undefined();
 }