[Extensions] Wait until the Window object is cleared before classifying contexts

extensions/renderer/extension_frame_helper.h

Index: extensions/renderer/extension_frame_helper.h
diff --git a/extensions/renderer/extension_frame_helper.h b/extensions/renderer/extension_frame_helper.h
index e6f542e18cd4561d4857c0869515814f3b7d85e7..a1d3833e8c9df261ccc8862a5e48d5278dc13797 100644
--- a/extensions/renderer/extension_frame_helper.h
+++ b/extensions/renderer/extension_frame_helper.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/memory/scoped_ptr.h"
 #include "content/public/common/console_message_level.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
@@ -71,8 +72,10 @@ class ExtensionFrameHelper
   void DidCreateScriptContext(v8::Local<v8::Context>,
                               int extension_group,
                               int world_id) override;
+  void DidClearWindowObject() override;
   void WillReleaseScriptContext(v8::Local<v8::Context>, int world_id) override;
   bool OnMessageReceived(const IPC::Message& message) override;
+  void DidStartProvisionalLoad() override;
 
   // IPC handlers.
   void OnExtensionDispatchOnConnect(
@@ -98,6 +101,11 @@ class ExtensionFrameHelper
                                 const base::ListValue& args,
                                 bool user_gesture);
 
+  struct PendingContext;
+  std::vector<scoped_ptr<PendingContext>> pending_contexts_;
+
+  bool did_clear_window_;
+
   // Type of view associated with the RenderFrame.
   ViewType view_type_;