[Extensions] Remove the source_tab_id property on API request messages

ExtensionHostMsg_Request_Params includes a "source_tab_id", but this
shouldn't be necessary. The browser can determine the tab id from which
RFH sent the request. Remove the property.

BUG=667584

Review-Url: https://codereview.chromium.org/2522763005
Cr-Commit-Position: refs/heads/master@{#434688}

extensions/browser/extension_function.cc

@@ -271,7 +271,6 @@ ExtensionFunction::ExtensionFunction()
       user_gesture_(false),
       bad_message_(false),
       histogram_value_(extensions::functions::UNKNOWN),
-      source_tab_id_(-1),
       source_context_type_(Feature::UNSPECIFIED_CONTEXT),
       source_process_id_(-1),
       did_respond_(false) {}

extensions/browser/extension_function.h

@@ -296,9 +296,6 @@ class ExtensionFunction
     response_callback_ = callback;
   }
 
-  void set_source_tab_id(int source_tab_id) { source_tab_id_ = source_tab_id; }
-  int source_tab_id() const { return source_tab_id_; }
-
   void set_source_context_type(extensions::Feature::Context type) {
     source_context_type_ = type;
   }
@@ -465,9 +462,6 @@ class ExtensionFunction
   // is invoked.
   extensions::functions::HistogramValue histogram_value_;
 
-  // The ID of the tab triggered this function call, or -1 if there is no tab.
-  int source_tab_id_;
-
   // The type of the JavaScript context where this call originated.
   extensions::Feature::Context source_context_type_;
 

extensions/browser/extension_function_dispatcher.cc

@@ -639,7 +639,6 @@ ExtensionFunction* ExtensionFunctionDispatcher::CreateExtensionFunction(
   function->set_extension(extension);
   function->set_profile_id(profile_id);
   function->set_response_callback(callback);
-  function->set_source_tab_id(params.source_tab_id);
   function->set_source_context_type(
       process_map.GetMostLikelyContextType(extension, requesting_process_id));
   function->set_source_process_id(requesting_process_id);

extensions/common/extension_messages.h

@@ -100,9 +100,6 @@ IPC_STRUCT_BEGIN(ExtensionHostMsg_Request_Params)
   // extension. Or, they can originate from hosted apps or normal web pages.
   IPC_STRUCT_MEMBER(GURL, source_url)
 
-  // The id of the tab that sent this request, or -1 if there is no source tab.
-  IPC_STRUCT_MEMBER(int, source_tab_id)
-
   // Unique request id to match requests and responses.
   IPC_STRUCT_MEMBER(int, request_id)
 

extensions/renderer/native_extension_bindings_system.cc

@@ -10,7 +10,6 @@
 #include "extensions/common/extension_api.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/features/feature_provider.h"
-#include "extensions/renderer/extension_frame_helper.h"
 #include "extensions/renderer/script_context.h"
 #include "extensions/renderer/script_context_set.h"
 #include "gin/converter.h"
@@ -180,20 +179,11 @@ void NativeExtensionBindingsSystem::SendRequest(
   else
     url = script_context->url();
 
-  int tab_id = -1;
-  if (content::RenderFrame* render_frame = script_context->GetRenderFrame()) {
-    ExtensionFrameHelper* frame_helper =
-        ExtensionFrameHelper::Get(render_frame);
-    DCHECK(frame_helper);
-    tab_id = frame_helper->tab_id();
-  }
-
   ExtensionHostMsg_Request_Params params;
   params.name = request->method_name;
   params.arguments.Swap(request->arguments.get());
   params.extension_id = script_context->GetExtensionID();
   params.source_url = url;
-  params.source_tab_id = tab_id;
   params.request_id = request->request_id;
   params.has_callback = request->has_callback;
   params.user_gesture = request->has_user_gesture;

extensions/renderer/native_extension_bindings_system_unittest.cc

@@ -75,7 +75,6 @@ class NativeExtensionBindingsSystemUnittest : public APIBindingTest {
     last_params_.arguments.Swap(params.arguments.CreateDeepCopy().get());
     last_params_.extension_id = params.extension_id;
     last_params_.source_url = params.source_url;
-    last_params_.source_tab_id = params.source_tab_id;
     last_params_.request_id = params.request_id;
     last_params_.has_callback = params.has_callback;
     last_params_.user_gesture = params.user_gesture;
@@ -173,7 +172,6 @@ TEST_F(NativeExtensionBindingsSystemUnittest, Basic) {
   EXPECT_EQ(extension->id(), last_params().extension_id);
   EXPECT_EQ("idle.queryState", last_params().name);
   EXPECT_EQ(extension->url(), last_params().source_url);
-  EXPECT_EQ(-1, last_params().source_tab_id);
   EXPECT_TRUE(last_params().has_callback);
   EXPECT_TRUE(
       last_params().arguments.Equals(ListValueFromString("[30]").get()));

extensions/renderer/request_sender.cc

@@ -10,7 +10,6 @@
 #include "content/public/renderer/render_frame.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension_messages.h"
-#include "extensions/renderer/extension_frame_helper.h"
 #include "extensions/renderer/script_context.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -95,20 +94,11 @@ bool RequestSender::StartRequest(Source* source,
                     name, source,
                     blink::WebUserGestureIndicator::currentUserGestureToken()));
 
-  int tab_id = -1;
-  if (render_frame) {
-    ExtensionFrameHelper* frame_helper =
-        ExtensionFrameHelper::Get(render_frame);
-    DCHECK(frame_helper);
-    tab_id = frame_helper->tab_id();
-  }
-
   ExtensionHostMsg_Request_Params params;
   params.name = name;
   params.arguments.Swap(value_args);
   params.extension_id = context->GetExtensionID();
   params.source_url = source_url;
-  params.source_tab_id = tab_id;
   params.request_id = request_id;
   params.has_callback = has_callback;
   params.user_gesture =