DRAFT CL: Check that we already know the renderer's page ID (outside commit).

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index fea916e68d920a2ffc7b2c26ea8388443caaedcf..e7e6f962ef5b9fc6081cd86edd3e90b3b46c0dc3 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -2805,8 +2805,11 @@ void WebContentsImpl::OnDidDownloadImage(
 void WebContentsImpl::OnUpdateFaviconURL(
     int32 page_id,
     const std::vector<FaviconURL>& candidates) {
+  // TODO(creis): It is not safe to use page_id here.  It looks unused, so clear
+  // it out.
+  int32 unused = -1;
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                    DidUpdateFaviconURL(page_id, candidates));
+                    DidUpdateFaviconURL(unused, candidates));
 }
 
 void WebContentsImpl::OnMediaPlayingNotification(int64 player_cookie,
@@ -2843,8 +2846,10 @@ void WebContentsImpl::OnMediaPausedNotification(int64 player_cookie) {
 }
 
 void WebContentsImpl::OnFirstVisuallyNonEmptyPaint(int32 page_id) {
+  // TODO(creis): This shouldn't have a page_id.  It's unused, so remove it.
+  int32 unused = -1;
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
-                    DidFirstVisuallyNonEmptyPaint(page_id));
+                    DidFirstVisuallyNonEmptyPaint(unused));
 }
 
 void WebContentsImpl::DidChangeVisibleSSLState() {