[Extensions] Fix improper extension tab ownership bug

extensions/renderer/extension_frame_helper.cc

 // 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.
 
 #include "extensions/renderer/extension_frame_helper.h"
 
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/api/messaging/message.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
@@ skipping 120 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(ExtensionFrameHelper, message)
     IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnConnect,
                         OnExtensionDispatchOnConnect)
     IPC_MESSAGE_HANDLER(ExtensionMsg_DeliverMessage, OnExtensionDeliverMessage)
     IPC_MESSAGE_HANDLER(ExtensionMsg_DispatchOnDisconnect,
                         OnExtensionDispatchOnDisconnect)
     IPC_MESSAGE_HANDLER(ExtensionMsg_SetTabId, OnExtensionSetTabId)
     IPC_MESSAGE_HANDLER(ExtensionMsg_UpdateBrowserWindowId,
                         OnUpdateBrowserWindowId)
-    IPC_MESSAGE_HANDLER(ExtensionMsg_SetMainFrameExtensionOwner,
-                        OnSetMainFrameExtensionOwner)
     IPC_MESSAGE_HANDLER(ExtensionMsg_NotifyRenderViewType,
                         OnNotifyRendererViewType)
     IPC_MESSAGE_HANDLER(ExtensionMsg_Response, OnExtensionResponse)
     IPC_MESSAGE_HANDLER(ExtensionMsg_MessageInvoke, OnExtensionMessageInvoke)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void ExtensionFrameHelper::OnExtensionDispatchOnConnect(
@@ skipping 30 matching lines @@
 void ExtensionFrameHelper::OnExtensionSetTabId(int tab_id) {
   CHECK_EQ(tab_id_, -1);
   CHECK_GE(tab_id, 0);
   tab_id_ = tab_id;
 }
 
 void ExtensionFrameHelper::OnUpdateBrowserWindowId(int browser_window_id) {
   browser_window_id_ = browser_window_id;
 }
 
-void ExtensionFrameHelper::OnSetMainFrameExtensionOwner(
-    const std::string& extension_id) {
-  tab_extension_owner_id_ = extension_id;
-}
-
 void ExtensionFrameHelper::OnNotifyRendererViewType(ViewType type) {
   // TODO(devlin): It'd be really nice to be able to
   // DCHECK_EQ(VIEW_TYPE_INVALID, view_type_) here.
   view_type_ = type;
 }
 
 void ExtensionFrameHelper::OnExtensionResponse(int request_id,
                                                bool success,
                                                const base::ListValue& response,
                                                const std::string& error) {
   extension_dispatcher_->OnExtensionResponse(request_id,
                                              success,
                                              response,
                                              error);
 }
 
 void ExtensionFrameHelper::OnExtensionMessageInvoke(
     const std::string& extension_id,
     const std::string& module_name,
     const std::string& function_name,
     const base::ListValue& args,
     bool user_gesture) {
   extension_dispatcher_->InvokeModuleSystemMethod(render_frame(), extension_id,
                                                   module_name, function_name,
                                                   args, user_gesture);
 }
 
 }  // namespace extensions