Revert 148074 - Pass the render process id to the FrameNavigationState.

chrome/browser/extensions/api/web_navigation/web_navigation_api.h

Index: chrome/browser/extensions/api/web_navigation/web_navigation_api.h
===================================================================
--- chrome/browser/extensions/api/web_navigation/web_navigation_api.h	(revision 148085)
+++ chrome/browser/extensions/api/web_navigation/web_navigation_api.h	(working copy)
@@ -50,34 +50,34 @@
   virtual void AboutToNavigateRenderView(
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidStartProvisionalLoadForFrame(
-      int64 frame_num,
+      int64 frame_id,
       bool is_main_frame,
       const GURL& validated_url,
       bool is_error_page,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidCommitProvisionalLoadForFrame(
-      int64 frame_num,
+      int64 frame_id,
       bool is_main_frame,
       const GURL& url,
       content::PageTransition transition_type,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFailProvisionalLoad(
-      int64 frame_num,
+      int64 frame_id,
       bool is_main_frame,
       const GURL& validated_url,
       int error_code,
       const string16& error_description,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DocumentLoadedInFrame(
-      int64 frame_num,
+      int64 frame_id,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFinishLoad(
-      int64 frame_num,
+      int64 frame_id,
       const GURL& validated_url,
       bool is_main_frame,
       content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void DidFailLoad(
-      int64 frame_num,
+      int64 frame_id,
       const GURL& validated_url,
       bool is_main_frame,
       int error_code,
@@ -88,14 +88,13 @@
                                    const content::Referrer& referrer,
                                    WindowOpenDisposition disposition,
                                    content::PageTransition transition,
-                                   int64 source_frame_num) OVERRIDE;
+                                   int64 source_frame_id) OVERRIDE;
   virtual void WebContentsDestroyed(content::WebContents* tab) OVERRIDE;
 
  private:
   // True if the transition and target url correspond to a reference fragment
   // navigation.
-  bool IsReferenceFragmentNavigation(FrameNavigationState::FrameID frame_id,
-                                     const GURL& url);
+  bool IsReferenceFragmentNavigation(int64 frame_id, const GURL& url);
 
   // Tracks the state of the frames we are sending events for.
   FrameNavigationState navigation_state_;