Upstream rewrite of Instant.

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/metrics/histogram.h"
@@ skipping 906 matching lines @@
 
 void WebContentsImpl::WasRestored() {
   controller_.SetActive(true);
   RenderWidgetHostViewPort* rwhv =
       RenderWidgetHostViewPort::FromRWHV(GetRenderWidgetHostView());
   if (rwhv) {
     rwhv->WasRestored();
 #if defined(OS_MACOSX)
     rwhv->SetActive(true);
 #endif
-  }
+  } else
+    LOG(WARNING) << "Restoring web contents with no rwhv";

[sreeram, 2012/07/24 14:08:32]

Revert the changes to this file (they seem unnecessary).

[Jered, 2012/07/24 15:24:34]

Done.

 
   last_selected_time_ = base::TimeTicks::Now();
 
   FOR_EACH_OBSERVER(WebContentsObserver, observers_, WasRestored());
 
   // The resize rect might have changed while this was inactive -- send the new
   // one to make sure it's up to date.
   RenderViewHostImpl* rvh =
       static_cast<RenderViewHostImpl*>(GetRenderViewHost());
-  if (rvh) {
+  if (rvh)
     rvh->ResizeRectChanged(GetRootWindowResizerRect());
-  }
 
   bool is_visible = true;
   content::NotificationService::current()->Notify(
       content::NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED,
       content::Source<WebContents>(this),
       content::Details<bool>(&is_visible));
 }
 
 void WebContentsImpl::WasHidden() {
   if (!capturing_contents_) {
@@ skipping 2127 matching lines @@
       browser_plugin_host()->embedder_render_process_host();
   *embedder_container_id = browser_plugin_host()->instance_id();
   int embedder_process_id =
       embedder_render_process_host ? embedder_render_process_host->GetID() : -1;
   if (embedder_process_id != -1) {
     *embedder_channel_name =
         StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(),
                      embedder_process_id);
   }
 }