[Extensions OOPI] Update app window bindings for OOPI

extensions/renderer/render_frame_observer_natives.cc

Index: extensions/renderer/render_frame_observer_natives.cc
diff --git a/extensions/renderer/render_view_observer_natives.cc b/extensions/renderer/render_frame_observer_natives.cc
similarity index 49%
rename from extensions/renderer/render_view_observer_natives.cc
rename to extensions/renderer/render_frame_observer_natives.cc
index 0140ec41d6e8fcab4c10d29b6a686445637d3f57..55ef8fcb9a81d4c1be105990ae8389c47970f2ff 100644
--- a/extensions/renderer/render_view_observer_natives.cc
+++ b/extensions/renderer/render_frame_observer_natives.cc
@@ -2,35 +2,29 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "extensions/renderer/render_view_observer_natives.h"
+#include "extensions/renderer/render_frame_observer_natives.h"
 
-#include "content/public/renderer/render_view.h"
-#include "content/public/renderer/render_view_observer.h"
-#include "extensions/common/extension_api.h"
+#include "content/public/renderer/render_frame.h"
+#include "content/public/renderer/render_frame_observer.h"
 #include "extensions/renderer/script_context.h"
-#include "third_party/WebKit/public/web/WebFrame.h"
-#include "third_party/WebKit/public/web/WebScopedMicrotaskSuppression.h"
 
 namespace extensions {
 
 namespace {
 
 // Deletes itself when done.
-class LoadWatcher : public content::RenderViewObserver {
+class LoadWatcher : public content::RenderFrameObserver {
  public:
   LoadWatcher(ScriptContext* context,
-              content::RenderView* view,
+              content::RenderFrame* frame,
               v8::Local<v8::Function> cb)
-      : content::RenderViewObserver(view),
+      : content::RenderFrameObserver(frame),
         context_(context),
         callback_(context->isolate(), cb) {}
 
-  void DidCreateDocumentElement(blink::WebLocalFrame* frame) override {
-    CallbackAndDie(true);
-  }
+  void DidCreateDocumentElement() override { CallbackAndDie(true); }
 
-  void DidFailProvisionalLoad(blink::WebLocalFrame* frame,
-                              const blink::WebURLError& error) override {
+  void DidFailProvisionalLoad(const blink::WebURLError& error) override {
     CallbackAndDie(false);
   }
 
@@ -46,32 +40,35 @@ class LoadWatcher : public content::RenderViewObserver {
 
   ScriptContext* context_;
   v8::Global<v8::Function> callback_;
+
   DISALLOW_COPY_AND_ASSIGN(LoadWatcher);
 };
+
 }  // namespace
 
-RenderViewObserverNatives::RenderViewObserverNatives(ScriptContext* context)
+RenderFrameObserverNatives::RenderFrameObserverNatives(ScriptContext* context)
     : ObjectBackedNativeHandler(context) {
-  RouteFunction("OnDocumentElementCreated",
-                base::Bind(&RenderViewObserverNatives::OnDocumentElementCreated,
-                           base::Unretained(this)));
+  RouteFunction(
+      "OnDocumentElementCreated",
+      base::Bind(&RenderFrameObserverNatives::OnDocumentElementCreated,
+                 base::Unretained(this)));
 }
 
-void RenderViewObserverNatives::OnDocumentElementCreated(
+void RenderFrameObserverNatives::OnDocumentElementCreated(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   CHECK(args.Length() == 2);
   CHECK(args[0]->IsInt32());
   CHECK(args[1]->IsFunction());
 
-  int view_id = args[0]->Int32Value();
+  int frame_id = args[0]->Int32Value();
 
-  content::RenderView* view = content::RenderView::FromRoutingID(view_id);
-  if (!view) {
-    LOG(WARNING) << "No render view found to register LoadWatcher.";
+  content::RenderFrame* frame = content::RenderFrame::FromRoutingID(frame_id);
+  if (!frame) {
+    LOG(WARNING) << "No render frame found to register LoadWatcher.";
     return;
   }
 
-  new LoadWatcher(context(), view, args[1].As<v8::Function>());
+  new LoadWatcher(context(), frame, args[1].As<v8::Function>());
 
   args.GetReturnValue().Set(true);
 }