<webview>: Implement support for package-local chrome-extension:// URLs

content/browser/web_contents/render_view_host_manager.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/render_view_host_manager.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ skipping 934 matching lines @@
 
     return pending_render_view_host_;
   } else {
     if (ShouldReuseWebUI(curr_entry, &entry)) {
       pending_web_ui_.reset();
       pending_and_current_web_ui_ = web_ui_->AsWeakPtr();
     } else {
       SetPendingWebUI(entry);
 
       // Make sure the new RenderViewHost has the right bindings.
-      if (pending_web_ui())
+      if (pending_web_ui() && !render_view_host_->GetProcess()->IsGuest())

[Charlie Reis, 2013/09/24 19:41:55]

Oops, looks like we missed this one in Hui's CL.  Can I ask you to land this
separately in case the rest needs to be reverted for some reason?

[Fady Samuel, 2013/09/24 23:05:02]

Done.

         render_view_host_->AllowBindings(pending_web_ui()->GetBindings());
     }
 
     if (pending_web_ui() && render_view_host_->IsRenderViewLive())
       pending_web_ui()->GetController()->RenderViewReused(render_view_host_);
 
     // The renderer can exit view source mode when any error or cancellation
     // happen. We must overwrite to recover the mode.
     if (entry.IsViewSourceMode()) {
       render_view_host_->Send(
@@ skipping 79 matching lines @@
 RenderViewHostImpl* RenderViewHostManager::GetSwappedOutRenderViewHost(
     SiteInstance* instance) {
   RenderViewHostMap::iterator iter = swapped_out_hosts_.find(instance->GetId());
   if (iter != swapped_out_hosts_.end())
     return iter->second;
 
   return NULL;
 }
 
 }  // namespace content