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

content/browser/web_contents/web_contents_impl.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.
 
 #include "content/browser/web_contents/web_contents_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 2787 matching lines @@
   if (!iter->second.is_null()) {
     iter->second.Run(
         id, http_status_code, image_url, bitmaps, original_bitmap_sizes);
   }
   image_download_map_.erase(id);
 }
 
 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,
                                                  bool has_video,
                                                  bool has_audio) {
 // Chrome OS does its own detection of audio and video.
 #if !defined(OS_CHROMEOS)
   scoped_ptr<PowerSaveBlocker> blocker;
   if (has_video) {
     blocker = PowerSaveBlocker::Create(
@@ skipping 16 matching lines @@
 
 void WebContentsImpl::OnMediaPausedNotification(int64 player_cookie) {
   // Chrome OS does its own detection of audio and video.
 #if !defined(OS_CHROMEOS)
   delete power_save_blockers_[render_view_message_source_][player_cookie];
   power_save_blockers_[render_view_message_source_].erase(player_cookie);
 #endif  // !defined(OS_CHROMEOS)
 }
 
 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() {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     DidChangeVisibleSSLState());
 }
 
 void WebContentsImpl::NotifyBeforeFormRepostWarningShow() {
   FOR_EACH_OBSERVER(WebContentsObserver, observers_,
                     BeforeFormRepostWarningShow());
@@ skipping 1066 matching lines @@
 
 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) {
   if (!delegate_)
     return;
   const gfx::Size new_size = GetPreferredSize();
   if (new_size != old_size)
     delegate_->UpdatePreferredSize(this, new_size);
 }
 
 }  // namespace content