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

extensions/renderer/extension_frame_helper.h

 // Copyright 2013 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.
 
 #ifndef EXTENSIONS_RENDERER_EXTENSION_FRAME_HELPER_H_
 #define EXTENSIONS_RENDERER_EXTENSION_FRAME_HELPER_H_
 
 #include <vector>
 
+#include "base/memory/scoped_vector.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"
 #include "extensions/common/view_type.h"
 
 struct ExtensionMsg_ExternalConnectionInfo;
 struct ExtensionMsg_TabConnectionInfo;
 
 namespace base {
 class ListValue;
@@ skipping 44 matching lines @@
   // RenderFrameObserver implementation.
   void DidCreateDocumentElement() override;
   void DidCreateNewDocument() override;
   void DidMatchCSS(
       const blink::WebVector<blink::WebString>& newly_matching_selectors,
       const blink::WebVector<blink::WebString>& stopped_matching_selectors)
           override;
   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(
       int target_port_id,
       const std::string& channel_name,
       const ExtensionMsg_TabConnectionInfo& source,
       const ExtensionMsg_ExternalConnectionInfo& info,
       const std::string& tls_channel_id);
   void OnExtensionDeliverMessage(int target_port_id,
                                  const Message& message);
   void OnExtensionDispatchOnDisconnect(int port_id,
                                        const std::string& error_message);
   void OnExtensionSetTabId(int tab_id);
   void OnUpdateBrowserWindowId(int browser_window_id);
   void OnNotifyRendererViewType(ViewType view_type);
   void OnExtensionResponse(int request_id,
                            bool success,
                            const base::ListValue& response,
                            const std::string& error);
   void OnExtensionMessageInvoke(const std::string& extension_id,
                                 const std::string& module_name,
                                 const std::string& function_name,
                                 const base::ListValue& args,
                                 bool user_gesture);
 
+  struct PendingContext;
+  ScopedVector<PendingContext> pending_contexts_;

[dcheng, 2015/11/13 00:26:34]

std::vector<scoped_ptr<PendingContext>>? =)

[Devlin, 2015/11/16 22:46:45]

Yay for c++11 support!

+
+  bool did_clear_window_;
+
   // Type of view associated with the RenderFrame.
   ViewType view_type_;
 
   // The id of the tab the render frame is attached to.
   int tab_id_;
 
   // The id of the browser window the render frame is attached to.
   int browser_window_id_;
 
   Dispatcher* extension_dispatcher_;
 
   // Whether or not the current document element has been created.
   bool did_create_current_document_element_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionFrameHelper);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_RENDERER_EXTENSION_FRAME_HELPER_H_