Update view_manager and window_manager to make use of content handling.

mojo/services/view_manager/view_manager_unittest.cc

 // Copyright 2014 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 <string>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/auto_reset.h"
 #include "base/bind.h"
@@ skipping 1142 matching lines @@
 }
 
 TEST_F(ViewManagerTest, ConnectTwice) {
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 2)));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   // Try to connect again to 1,1, this should fail as already connected to that
   // root.
-  ASSERT_FALSE(connection_->Embed(BuildViewId(1, 1), kTestServiceURL));
+  ASSERT_TRUE(connection_->Embed(BuildViewId(1, 1), kTestServiceURL));
 
   // Connecting to 1,2 should succeed and end up in connection2.
   {
     ASSERT_TRUE(connection_->Embed(BuildViewId(1, 2), kTestServiceURL));
     connection2_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection2_->changes()));
     ASSERT_EQ(1u, changes.size());
-    EXPECT_EQ("OnEmbed creator=mojo:test_url", changes[0]);
-    EXPECT_EQ("[view=1,2 parent=null]",
-              ChangeViewDescription(connection2_->changes()));
+    EXPECT_EQ("ViewDeleted view=1,1", changes[0]);
   }
 }
 
 TEST_F(ViewManagerTest, OnViewInput) {
   ASSERT_TRUE(connection_->CreateView(BuildViewId(1, 1)));
   ASSERT_NO_FATAL_FAILURE(EstablishSecondConnection(false));
 
   // Dispatch an event to the view and verify its received.
   {
     EventPtr event(Event::New());
@@ skipping 45 matching lines @@
 
   // Connection 1 should have been told about the add (it owns the view).
   {
     connection_->DoRunLoopUntilChangesCount(1);
     const Changes changes(ChangesToDescription1(connection_->changes()));
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("HierarchyChanged view=3,1 new_parent=1,1 old_parent=null",
               changes[0]);
   }
 
-  // Embed 1,1 back in connection 2.
+  // Embed 1,1 again.
   {
-    // 2 should be told about the new embed.
+    // We should get a new connection for the new embedding.
     ASSERT_TRUE(connection_->Embed(BuildViewId(1, 1), kTestServiceURL));
-    connection2_->DoRunLoopUntilChangesCount(1);
-    const std::vector<Change>& changes(connection2_->changes());
+    ViewManagerProxy* connection4 = ViewManagerProxy::WaitForInstance();
+    connection4->DoRunLoopUntilChangesCount(1);
+    const std::vector<Change>& changes(connection4->changes());
     ASSERT_EQ(1u, changes.size());
     EXPECT_EQ("OnEmbed creator=mojo:test_url",
               ChangesToDescription1(changes)[0]);
     EXPECT_EQ("[view=1,1 parent=null]", ChangeViewDescription(changes));
 
     // And 3 should get a delete.
     connection3_->DoRunLoopUntilChangesCount(1);
     ASSERT_EQ(1u, connection3_->changes().size());
     EXPECT_EQ("ViewDeleted view=1,1",
               ChangesToDescription1(connection3_->changes())[0]);
@@ skipping 26 matching lines @@
 
 // TODO(sky): add coverage of test that destroys connections and ensures other
 // connections get deletion notification.
 
 // TODO(sky): need to better track changes to initial connection. For example,
 // that SetBounsdViews/AddView and the like don't result in messages to the
 // originating connection.
 
 }  // namespace service
 }  // namespace mojo