Changes around how embed roots are set

components/web_view/web_view_impl.cc

 // Copyright 2015 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 "components/web_view/web_view_impl.h"
 
 #include "base/command_line.h"
 #include "components/devtools_service/public/cpp/switches.h"
 #include "components/view_manager/public/cpp/scoped_view_ptr.h"
 #include "components/view_manager/public/cpp/view.h"
@@ skipping 74 matching lines @@
 
 void WebViewImpl::GetViewTreeClient(
     mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) {
   mojo::ViewTreeConnection::Create(this, view_tree_client.Pass());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, mojo::ViewTreeDelegate implementation:
 
 void WebViewImpl::OnEmbed(mojo::View* root) {
-  root->connection()->SetEmbedRoot();
+  // We must have been granted embed root priviledges, otherwise we can't
+  // Embed() in any descendants.
+  DCHECK(root->connection()->IsEmbedRoot());
   root->AddObserver(this);
   root_ = root;
   content_ = root->connection()->CreateView();
   content_->SetBounds(*mojo::Rect::From(gfx::Rect(0, 0, root->bounds().width,
                                                   root->bounds().height)));
   root->AddChild(content_);
   content_->SetVisible(true);
   content_->AddObserver(this);
 
   if (pending_load_ && pending_load_->is_content_handler_id_valid())
@@ skipping 63 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WebViewImpl, FrameDevToolsAgentDelegate implementation:
 
 void WebViewImpl::HandlePageNavigateRequest(const GURL& url) {
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = url.spec();
   client_->TopLevelNavigate(request.Pass());
 }
 
 }  // namespace web_view