Merge http://src.chromium.org/viewvc/chrome?view=rev&revision=125923 by

content/browser/renderer_host/render_view_host.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/renderer_host/render_view_host.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 562 matching lines @@
       gfx::Point(client_x, client_y),
       gfx::Point(screen_x, screen_y),
       false, WebDragOperationNone));
 }
 
 void RenderViewHost::DragSourceSystemDragEnded() {
   Send(new DragMsg_SourceSystemDragEnded(routing_id()));
 }
 
 void RenderViewHost::AllowBindings(int bindings_flags) {
+  // Ensure we aren't granting bindings to a process that has already
+  // been used for non-privileged views.
+  if (process()->HasConnection() &&
+      !ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings(
+          process()->GetID())) {
+    // This process has no bindings yet. Make sure it does not have more
+    // than this single view.
+    content::RenderProcessHost::listeners_iterator iter(
+        process()->ListenersIterator());
+    iter.Advance();
+    if (!iter.IsAtEnd())
+      return;
+  }
+
   if (bindings_flags & content::BINDINGS_POLICY_WEB_UI) {
     ChildProcessSecurityPolicy::GetInstance()->GrantWebUIBindings(
         process()->GetID());
   }
 
   enabled_bindings_ |= bindings_flags;
   if (renderer_initialized_)
     Send(new ViewMsg_AllowBindings(routing_id(), enabled_bindings_));
 }
 
 void RenderViewHost::SetWebUIProperty(const std::string& name,
                                       const std::string& value) {
-  DCHECK(enabled_bindings_  & content::BINDINGS_POLICY_WEB_UI);
-  Send(new ViewMsg_SetWebUIProperty(routing_id(), name, value));
+  // This is just a sanity check before telling the renderer to enable the
+  // property.  It could lie and send the corresponding IPC messages anyway,
+  // but we will not act on them if enabled_bindings_ doesn't agree.
+  if (enabled_bindings_ & content::BINDINGS_POLICY_WEB_UI)
+    Send(new ViewMsg_SetWebUIProperty(routing_id(), name, value));
+  else
+    NOTREACHED() << "WebUI bindings not enabled.";
 }
 
 void RenderViewHost::GotFocus() {
   RenderWidgetHost::GotFocus();  // Notifies the renderer it got focus.
 
   RenderViewHostDelegate::View* view = delegate_->GetViewDelegate();
   if (view)
     view->GotFocus();
 }
 
@@ skipping 946 matching lines @@
   // Whenever we change swap out state, we should not be waiting for
   // beforeunload or unload acks.  We clear them here to be safe, since they
   // can cause navigations to be ignored in OnMsgNavigate.
   is_waiting_for_beforeunload_ack_ = false;
   is_waiting_for_unload_ack_ = false;
 }
 
 void RenderViewHost::ClearPowerSaveBlockers() {
   STLDeleteValues(&power_save_blockers_);
 }