[Extensions] Remove RequestSender::ScopedTabID

extensions/renderer/request_sender.cc

 // Copyright 2014 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/request_sender.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/elapsed_timer.h"
 #include "base/values.h"
 #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"
 #include "third_party/WebKit/public/web/WebScopedUserGesture.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 #include "third_party/WebKit/public/web/WebUserGestureToken.h"
 
 namespace extensions {
 
 // Contains info relevant to a pending API request.
 struct PendingRequest {
  public:
   PendingRequest(const std::string& name,
                  RequestSender::Source* source,
                  blink::WebUserGestureToken token)
       : name(name), source(source), token(token) {}
 
   std::string name;
   RequestSender::Source* source;
   blink::WebUserGestureToken token;
 };
 
-RequestSender::ScopedTabID::ScopedTabID(RequestSender* request_sender,
-                                        int tab_id)
-    : request_sender_(request_sender),
-      tab_id_(tab_id),
-      previous_tab_id_(request_sender->source_tab_id_) {
-  request_sender_->source_tab_id_ = tab_id;
-}
 
-RequestSender::ScopedTabID::~ScopedTabID() {
-  DCHECK_EQ(tab_id_, request_sender_->source_tab_id_);
-  request_sender_->source_tab_id_ = previous_tab_id_;
-}
-
-RequestSender::RequestSender() : source_tab_id_(-1) {}
+RequestSender::RequestSender() {}
 
 RequestSender::~RequestSender() {}
 
 void RequestSender::InsertRequest(
     int request_id,
     std::unique_ptr<PendingRequest> pending_request) {
   DCHECK_EQ(0u, pending_requests_.count(request_id));
   pending_requests_[request_id] = std::move(pending_request);
 }
 
@@ skipping 40 matching lines @@
 
   GURL source_url;
   if (blink::WebLocalFrame* webframe = context->web_frame())
     source_url = webframe->document().url();
 
   InsertRequest(request_id,
                 base::MakeUnique<PendingRequest>(
                     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 = source_tab_id_;
+  params.source_tab_id = tab_id;
   params.request_id = request_id;
   params.has_callback = has_callback;
   params.user_gesture =
       blink::WebUserGestureIndicator::isProcessingUserGesture();
 
   // Set Service Worker specific params to default values.
   params.worker_thread_id = -1;
   params.service_worker_version_id = kInvalidServiceWorkerVersionId;
 
   SendRequest(render_frame, for_io_thread, params);
@@ skipping 37 matching lines @@
   for (PendingRequestMap::iterator it = pending_requests_.begin();
        it != pending_requests_.end();) {
     if (it->second->source == source)
       pending_requests_.erase(it++);
     else
       ++it;
   }
 }
 
 }  // namespace extensions