[Extensions] Clean up WebRequest API IO thread-related cruft.
When the Web Request API was moved to the UI thread, there was a fair
amount clean up to do be done. This CL cleans up a bit more.
Bug: 980774
Change-Id: I6a4ab52eda0508aa14c677a6fd5fddc393d3e570
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1982687
Reviewed-by: Devlin <[email protected]>
Commit-Queue: David Bertoni <[email protected]>
Cr-Commit-Position: refs/heads/master@{#728086}
diff --git a/extensions/browser/extension_function_dispatcher.h b/extensions/browser/extension_function_dispatcher.h
index 6721cee..44d5385 100644
--- a/extensions/browser/extension_function_dispatcher.h
+++ b/extensions/browser/extension_function_dispatcher.h
@@ -98,19 +98,19 @@
void set_delegate(Delegate* delegate) { delegate_ = delegate; }
private:
- // For a given RenderFrameHost instance, UIThreadResponseCallbackWrapper
+ // For a given RenderFrameHost instance, ResponseCallbackWrapper
// creates ExtensionFunction::ResponseCallback instances which send responses
// to the corresponding render view in ExtensionMsg_Response messages.
// This class tracks the lifespan of the RenderFrameHost instance, and will be
// destroyed automatically when it goes away.
- class UIThreadResponseCallbackWrapper;
+ class ResponseCallbackWrapper;
- // Same as UIThreadResponseCallbackWrapper above, but applies to an extension
+ // Same as ResponseCallbackWrapper above, but applies to an extension
// function from an extension Service Worker.
- class UIThreadWorkerResponseCallbackWrapper;
+ class WorkerResponseCallbackWrapper;
- // Key used to store UIThreadWorkerResponseCallbackWrapper in the map
- // |ui_thread_response_callback_wrappers_for_worker_|.
+ // Key used to store WorkerResponseCallbackWrapper in the map
+ // |response_callback_wrappers_for_worker_|.
struct WorkerResponseCallbackMapKey;
// Helper to check whether an ExtensionFunction has the required permissions.
@@ -155,17 +155,16 @@
// instance goes away, the corresponding entry in this map (if exists) will be
// removed.
typedef std::map<content::RenderFrameHost*,
- std::unique_ptr<UIThreadResponseCallbackWrapper>>
- UIThreadResponseCallbackWrapperMap;
- UIThreadResponseCallbackWrapperMap ui_thread_response_callback_wrappers_;
+ std::unique_ptr<ResponseCallbackWrapper>>
+ ResponseCallbackWrapperMap;
+ ResponseCallbackWrapperMap response_callback_wrappers_;
- using UIThreadWorkerResponseCallbackWrapperMap =
+ using WorkerResponseCallbackWrapperMap =
std::map<WorkerResponseCallbackMapKey,
- std::unique_ptr<UIThreadWorkerResponseCallbackWrapper>>;
+ std::unique_ptr<WorkerResponseCallbackWrapper>>;
// TODO(lazyboy): The map entries are cleared upon RenderProcessHost shutown,
// we should really be clearing it on service worker shutdown.
- UIThreadWorkerResponseCallbackWrapperMap
- ui_thread_response_callback_wrappers_for_worker_;
+ WorkerResponseCallbackWrapperMap response_callback_wrappers_for_worker_;
};
} // namespace extensions
