Send the correct process ID with webNavigation events

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 "base/json/json_writer.h"
 #include "base/string_number_conversions.h"
@@ skipping 41 matching lines @@
 }
 
 }  // namespace
 
 int GetFrameId(bool is_main_frame, int64 frame_id) {
   return is_main_frame ? 0 : static_cast<int>(frame_id);
 }
 
 // Constructs and dispatches an onBeforeNavigate event.
 void DispatchOnBeforeNavigate(content::WebContents* web_contents,
+                              int render_process_id,
                               int64 frame_id,
                               bool is_main_frame,
                               const GURL& validated_url) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, validated_url.spec());
-  dict->SetInteger(keys::kProcessIdKey,
-                   web_contents->GetRenderViewHost()->GetProcess()->GetID());
+  dict->SetInteger(keys::kProcessIdKey, render_process_id);
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args.Append(dict);
 
   DispatchEvent(web_contents->GetBrowserContext(),
                 keys::kOnBeforeNavigate,
                 args,
                 validated_url);
 }
 
 // Constructs and dispatches an onCommitted or onReferenceFragmentUpdated
 // event.
 void DispatchOnCommitted(const char* event_name,
                          content::WebContents* web_contents,

[battre, 2012/07/23 12:06:35]

Optional: have you considered passing the render_process_id in all dispatch
methods for consistency?

[jochen (gone - plz use gerrit), 2012/07/23 13:17:13]

Yes, but I didn't like it :)

The places I pass the process_id are when it's different from the one in
web_contents->GetRenderViewHost()->GetProcess()->GetID().

                          int64 frame_id,
                          bool is_main_frame,
                          const GURL& url,
                          content::PageTransition transition_type) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, url.spec());
   dict->SetInteger(keys::kProcessIdKey,
                    web_contents->GetRenderViewHost()->GetProcess()->GetID());
@@ skipping 87 matching lines @@
                    ExtensionTabUtil::GetTabId(target_web_contents));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args.Append(dict);
 
   DispatchEvent(browser_context, keys::kOnCreatedNavigationTarget, args,
                 target_url);
 }
 
 // Constructs and dispatches an onErrorOccurred event.
 void DispatchOnErrorOccurred(content::WebContents* web_contents,
+                             int render_process_id,
                              const GURL& url,
                              int64 frame_id,
                              bool is_main_frame,
                              int error_code) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(keys::kTabIdKey, ExtensionTabUtil::GetTabId(web_contents));
   dict->SetString(keys::kUrlKey, url.spec());
-  dict->SetInteger(keys::kProcessIdKey,
-                   web_contents->GetRenderViewHost()->GetProcess()->GetID());
+  dict->SetInteger(keys::kProcessIdKey, render_process_id);
   dict->SetInteger(keys::kFrameIdKey, GetFrameId(is_main_frame, frame_id));
   dict->SetString(keys::kErrorKey, net::ErrorToString(error_code));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args.Append(dict);
 
   DispatchEvent(web_contents->GetBrowserContext(), keys::kOnErrorOccurred,
                 args, url);
 }
 
 // Constructs and dispatches an onTabReplaced event.
 void DispatchOnTabReplaced(
     content::WebContents* old_web_contents,
     content::BrowserContext* browser_context,
     content::WebContents* new_web_contents) {
   ListValue args;
   DictionaryValue* dict = new DictionaryValue();
   dict->SetInteger(keys::kReplacedTabIdKey,
                    ExtensionTabUtil::GetTabId(old_web_contents));
   dict->SetInteger(keys::kTabIdKey,
                    ExtensionTabUtil::GetTabId(new_web_contents));
   dict->SetDouble(keys::kTimeStampKey, MilliSecondsFromTime(base::Time::Now()));
   args.Append(dict);
 
   DispatchEvent(browser_context, keys::kOnTabReplaced, args, GURL());
 }
 
 }  // namespace web_navigation_api_helpers
 
 }  // namespace extensions