[Extensions] Make Event::restrict_to_browser_context const.

chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc

 // Copyright (c) 2012 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.
 
 // Implements the Chrome Extensions WebNavigation API.
 
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h"
 
 #include <memory>
 #include <utility>
@@ skipping 37 matching lines @@
 // Dispatches events to the extension message service.
 void DispatchEvent(content::BrowserContext* browser_context,
                    std::unique_ptr<Event> event,
                    const GURL& url) {
   EventFilteringInfo info;
   info.SetURL(url);
 
   Profile* profile = Profile::FromBrowserContext(browser_context);
   EventRouter* event_router = EventRouter::Get(profile);
   if (profile && event_router) {
-    event->restrict_to_browser_context = profile;

[Devlin, 2017/05/24 16:08:18]

maybe substitute this with DCHECK_EQ(profile,
event->restrict_to_browser_context)?

[lazyboy, 2017/05/24 19:19:33]

Done.

     event->filter_info = info;
     event_router->BroadcastEvent(std::move(event));
   }
 }
 
 }  // namespace
 
 // Constructs an onBeforeNavigate event.
 std::unique_ptr<Event> CreateOnBeforeNavigateEvent(
     content::NavigationHandle* navigation_handle) {
   GURL url(navigation_handle->GetURL());
 
   web_navigation::OnBeforeNavigate::Details details;
   details.tab_id =
       ExtensionTabUtil::GetTabId(navigation_handle->GetWebContents());
   details.url = url.spec();
   details.process_id = -1;
   details.frame_id = ExtensionApiFrameIdMap::GetFrameId(navigation_handle);
   details.parent_frame_id =
       ExtensionApiFrameIdMap::GetParentFrameId(navigation_handle);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
-  std::unique_ptr<Event> event(
-      new Event(events::WEB_NAVIGATION_ON_BEFORE_NAVIGATE,
-                web_navigation::OnBeforeNavigate::kEventName,
-                web_navigation::OnBeforeNavigate::Create(details)));
+  auto event = base::MakeUnique<Event>(
+      events::WEB_NAVIGATION_ON_BEFORE_NAVIGATE,
+      web_navigation::OnBeforeNavigate::kEventName,
+      web_navigation::OnBeforeNavigate::Create(details),
+      navigation_handle->GetWebContents()->GetBrowserContext());
 
   EventFilteringInfo info;
   info.SetURL(navigation_handle->GetURL());
-
-  event->restrict_to_browser_context =
-      navigation_handle->GetWebContents()->GetBrowserContext();
   event->filter_info = info;
 
   return event;
 }
 
 // Constructs and dispatches an onCommitted or onReferenceFragmentUpdated
 // event.
 void DispatchOnCommitted(events::HistogramValue histogram_value,
                          const std::string& event_name,
                          content::NavigationHandle* navigation_handle) {
@@ skipping 30 matching lines @@
   if (transition_type & ui::PAGE_TRANSITION_SERVER_REDIRECT)
     qualifiers->AppendString("server_redirect");
   if (transition_type & ui::PAGE_TRANSITION_FORWARD_BACK)
     qualifiers->AppendString("forward_back");
   if (transition_type & ui::PAGE_TRANSITION_FROM_ADDRESS_BAR)
     qualifiers->AppendString("from_address_bar");
   dict->Set(keys::kTransitionQualifiersKey, std::move(qualifiers));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args->Append(std::move(dict));
 
-  std::unique_ptr<Event> event(
-      new Event(histogram_value, event_name, std::move(args)));
-  DispatchEvent(navigation_handle->GetWebContents()->GetBrowserContext(),
-                std::move(event), url);
+  content::BrowserContext* context =
+      navigation_handle->GetWebContents()->GetBrowserContext();
+  auto event = base::MakeUnique<Event>(histogram_value, event_name,
+                                       std::move(args), context);
+  DispatchEvent(context, std::move(event), url);
 }
 
 // Constructs and dispatches an onDOMContentLoaded event.
 void DispatchOnDOMContentLoaded(content::WebContents* web_contents,
                                 content::RenderFrameHost* frame_host,
                                 const GURL& url) {
   web_navigation::OnDOMContentLoaded::Details details;
   details.tab_id = ExtensionTabUtil::GetTabId(web_contents);
   details.url = url.spec();
   details.process_id = frame_host->GetProcess()->GetID();
   details.frame_id = ExtensionApiFrameIdMap::GetFrameId(frame_host);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
   std::unique_ptr<Event> event(
       new Event(events::WEB_NAVIGATION_ON_DOM_CONTENT_LOADED,
                 web_navigation::OnDOMContentLoaded::kEventName,
                 web_navigation::OnDOMContentLoaded::Create(details)));

[Devlin, 2017/05/24 16:08:18]

We need to add restrict_to_browser_context here if we remove it from
DispatchEvent()

[lazyboy, 2017/05/24 19:19:33]

Thanks for catching this!
Done.

   DispatchEvent(web_contents->GetBrowserContext(), std::move(event), url);
 }
 
 // Constructs and dispatches an onCompleted event.
 void DispatchOnCompleted(content::WebContents* web_contents,
                          content::RenderFrameHost* frame_host,
                          const GURL& url) {
   web_navigation::OnCompleted::Details details;
   details.tab_id = ExtensionTabUtil::GetTabId(web_contents);
   details.url = url.spec();
   details.process_id = frame_host->GetProcess()->GetID();
   details.frame_id = ExtensionApiFrameIdMap::GetFrameId(frame_host);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
   std::unique_ptr<Event> event(
       new Event(events::WEB_NAVIGATION_ON_COMPLETED,
                 web_navigation::OnCompleted::kEventName,
                 web_navigation::OnCompleted::Create(details)));

[Devlin, 2017/05/24 16:08:18]

ditto

[lazyboy, 2017/05/24 19:19:32]

Done.

   DispatchEvent(web_contents->GetBrowserContext(), std::move(event), url);
 }
 
 // Constructs and dispatches an onCreatedNavigationTarget event.
 void DispatchOnCreatedNavigationTarget(
     content::WebContents* web_contents,
     content::BrowserContext* browser_context,
     content::RenderFrameHost* source_frame_host,
     content::WebContents* target_web_contents,
     const GURL& target_url) {
   // Check that the tab is already inserted into a tab strip model. This code
   // path is exercised by ExtensionApiTest.WebNavigationRequestOpenTab.
   DCHECK(ExtensionTabUtil::GetTabById(
       ExtensionTabUtil::GetTabId(target_web_contents),
       Profile::FromBrowserContext(target_web_contents->GetBrowserContext()),
       false, NULL, NULL, NULL, NULL));
 
   web_navigation::OnCreatedNavigationTarget::Details details;
   details.source_tab_id = ExtensionTabUtil::GetTabId(web_contents);
   details.source_process_id = source_frame_host->GetProcess()->GetID();
   details.source_frame_id =
       ExtensionApiFrameIdMap::GetFrameId(source_frame_host);
   details.url = target_url.possibly_invalid_spec();
   details.tab_id = ExtensionTabUtil::GetTabId(target_web_contents);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
-  std::unique_ptr<Event> event(
-      new Event(events::WEB_NAVIGATION_ON_CREATED_NAVIGATION_TARGET,
-                web_navigation::OnCreatedNavigationTarget::kEventName,
-                web_navigation::OnCreatedNavigationTarget::Create(details)));
+  auto event = base::MakeUnique<Event>(
+      events::WEB_NAVIGATION_ON_CREATED_NAVIGATION_TARGET,
+      web_navigation::OnCreatedNavigationTarget::kEventName,
+      web_navigation::OnCreatedNavigationTarget::Create(details),
+      browser_context);
   DispatchEvent(browser_context, std::move(event), target_url);
 
   // If the target WebContents already received the onBeforeNavigate event,
   // send it immediately after the onCreatedNavigationTarget above.
   WebNavigationTabObserver* target_observer =
       WebNavigationTabObserver::Get(target_web_contents);
   target_observer->DispatchCachedOnBeforeNavigate();
 }
 
 // Constructs and dispatches an onErrorOccurred event.
 void DispatchOnErrorOccurred(content::WebContents* web_contents,
                              content::RenderFrameHost* frame_host,
                              const GURL& url,
                              int error_code) {
   web_navigation::OnErrorOccurred::Details details;
   details.tab_id = ExtensionTabUtil::GetTabId(web_contents);
   details.url = url.spec();
   details.process_id = frame_host->GetProcess()->GetID();
   details.frame_id = ExtensionApiFrameIdMap::GetFrameId(frame_host);
   details.error = net::ErrorToString(error_code);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
-  std::unique_ptr<Event> event(
-      new Event(events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
-                web_navigation::OnErrorOccurred::kEventName,
-                web_navigation::OnErrorOccurred::Create(details)));
+  auto event =
+      base::MakeUnique<Event>(events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
+                              web_navigation::OnErrorOccurred::kEventName,
+                              web_navigation::OnErrorOccurred::Create(details),
+                              web_contents->GetBrowserContext());
   DispatchEvent(web_contents->GetBrowserContext(), std::move(event), url);

[Devlin, 2017/05/24 16:08:19]

nit: cache context

[lazyboy, 2017/05/24 19:19:32]

Done.

 }
 
 void DispatchOnErrorOccurred(content::NavigationHandle* navigation_handle) {
   web_navigation::OnErrorOccurred::Details details;
   details.tab_id =
       ExtensionTabUtil::GetTabId(navigation_handle->GetWebContents());
   details.url = navigation_handle->GetURL().spec();
   details.process_id = -1;
   details.frame_id = ExtensionApiFrameIdMap::GetFrameId(navigation_handle);
   details.error = (navigation_handle->GetNetErrorCode() != net::OK)
                       ? net::ErrorToString(navigation_handle->GetNetErrorCode())
                       : net::ErrorToString(net::ERR_ABORTED);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
-  std::unique_ptr<Event> event(
-      new Event(events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
-                web_navigation::OnErrorOccurred::kEventName,
-                web_navigation::OnErrorOccurred::Create(details)));
-  DispatchEvent(navigation_handle->GetWebContents()->GetBrowserContext(),
-                std::move(event), navigation_handle->GetURL());
+  content::BrowserContext* context =
+      navigation_handle->GetWebContents()->GetBrowserContext();
+  auto event = base::MakeUnique<Event>(
+      events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
+      web_navigation::OnErrorOccurred::kEventName,
+      web_navigation::OnErrorOccurred::Create(details), context);
+  DispatchEvent(context, std::move(event), navigation_handle->GetURL());
 }
 
 // Constructs and dispatches an onTabReplaced event.
 void DispatchOnTabReplaced(
     content::WebContents* old_web_contents,
     content::BrowserContext* browser_context,
     content::WebContents* new_web_contents) {
   web_navigation::OnTabReplaced::Details details;
   details.replaced_tab_id = ExtensionTabUtil::GetTabId(old_web_contents);
   details.tab_id = ExtensionTabUtil::GetTabId(new_web_contents);
   details.time_stamp = MilliSecondsFromTime(base::Time::Now());
 
-  std::unique_ptr<Event> event(
-      new Event(events::WEB_NAVIGATION_ON_TAB_REPLACED,
-                web_navigation::OnTabReplaced::kEventName,
-                web_navigation::OnTabReplaced::Create(details)));
+  auto event = base::MakeUnique<Event>(
+      events::WEB_NAVIGATION_ON_TAB_REPLACED,
+      web_navigation::OnTabReplaced::kEventName,
+      web_navigation::OnTabReplaced::Create(details), browser_context);
   DispatchEvent(browser_context, std::move(event), GURL());
 }
 
 }  // namespace web_navigation_api_helpers
 
 }  // namespace extensions