Cleanup: Stop creating RenderViewObservers from chrome/ in RenderViewer.

chrome/renderer/searchbox_extension.cc

-// 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.
 
 #include "chrome/renderer/searchbox_extension.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/string_split.h"
@@ skipping 197 matching lines @@
   return RenderView::FromWebView(webview);
 }
 
 // static
 v8::Handle<v8::Value> SearchBoxExtensionWrapper::GetValue(
     const v8::Arguments& args) {
   RenderView* render_view = GetRenderView();
   if (!render_view) return v8::Undefined();
   return v8::String::New(
       reinterpret_cast<const uint16_t*>(
-          render_view->searchbox()->value().c_str()),
-      render_view->searchbox()->value().length());
+          SearchBox::Get(render_view)->value().c_str()),
+      SearchBox::Get(render_view)->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());
+  return v8::Boolean::New(SearchBox::Get(render_view)->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());
+  return v8::Int32::New(SearchBox::Get(render_view)->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());
+  return v8::Int32::New(SearchBox::Get(render_view)->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());
+  return v8::Int32::New(SearchBox::Get(render_view)->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());
+  return v8::Int32::New(SearchBox::Get(render_view)->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());
+  return v8::Int32::New(SearchBox::Get(render_view)->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());
+  return v8::Int32::New(SearchBox::Get(render_view)->rect().height());
 }
 
 // Accepts a single argument in form:
 // {
 //   suggestions: [
 //     {
 //       value: "..."
 //     }
 //   ]
 // }
@@ skipping 48 matching lines @@
       if (complete_value->IsString()) {
         if (complete_value->Equals(v8::String::New("never")))
           behavior = INSTANT_COMPLETE_NEVER;
         else if (complete_value->Equals(v8::String::New("delayed")))
           behavior = INSTANT_COMPLETE_DELAYED;
       }
     }
   }
 
   if (RenderView* render_view = GetRenderView())
-    render_view->searchbox()->SetSuggestions(suggestions, behavior);
+    SearchBox::Get(render_view)->SetSuggestions(suggestions, behavior);
   return v8::Undefined();
 }
 
 // static
 bool Dispatch(WebFrame* frame, const std::string& event_name) {
   DCHECK(frame) << "Dispatch requires frame";
   if (!frame) return false;
 
   v8::HandleScope handle_scope;
   v8::Local<v8::Context> context = frame->mainWorldScriptContext();
@@ skipping 70 matching lines @@
 
   return supports_searchbox_api || supports_deprecated_api;
 }
 
 // static
 v8::Extension* SearchBoxExtension::Get() {
   return new SearchBoxExtensionWrapper();
 }
 
 }  // namespace extensions_v8