Nukes the windowmanager interface

components/view_manager/view_manager_client_apptest.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 "components/view_manager/public/cpp/view_manager.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h"
 #include "components/view_manager/public/cpp/view_manager_client_factory.h"
-#include "components/view_manager/public/cpp/view_manager_context.h"
 #include "components/view_manager/public/cpp/view_manager_delegate.h"
+#include "components/view_manager/public/cpp/view_manager_init.h"
 #include "components/view_manager/public/cpp/view_observer.h"
 #include "mojo/application/application_test_base_chromium.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/service_provider_impl.h"
 #include "ui/mojo/geometry/geometry_util.h"
 
 namespace mojo {
 
@@ skipping 192 matching lines @@
     most_recent_view_manager_ = root->view_manager();
     QuitRunLoop();
   }
   void OnViewManagerDisconnected(ViewManager* view_manager) override {}
 
  private:
   // Overridden from testing::Test:
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
-    view_manager_context_.reset(new ViewManagerContext(application_impl()));
-    view_manager_context_->Embed(application_impl()->url());
+    view_manager_init_.reset(
+        new ViewManagerInit(application_impl(), this, nullptr));
     ASSERT_TRUE(DoRunLoopWithTimeout());
     std::swap(window_manager_, most_recent_view_manager_);
   }
 
   // Overridden from testing::Test:
   void TearDown() override { ApplicationTestBase::TearDown(); }
 
+  scoped_ptr<ViewManagerInit> view_manager_init_;
+
   scoped_ptr<ViewManagerClientFactory> view_manager_client_factory_;
 
-  scoped_ptr<ViewManagerContext> view_manager_context_;
-
   // Used to receive the most recent view manager loaded by an embed action.
   ViewManager* most_recent_view_manager_;
   // The View Manager connection held by the window manager (app running at the
   // root view).
   ViewManager* window_manager_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ViewManagerTest);
 };
 
 TEST_F(ViewManagerTest, RootView) {
   ASSERT_NE(nullptr, window_manager());
   EXPECT_NE(nullptr, window_manager()->GetRoot());
-  EXPECT_EQ("mojo:window_manager", window_manager()->GetEmbedderURL());
+  // No one embedded the window_manager(), so it has no url.
+  EXPECT_TRUE(window_manager()->GetEmbedderURL().empty());
 }
 
 TEST_F(ViewManagerTest, Embed) {
   View* view = window_manager()->CreateView();
   ASSERT_NE(nullptr, view);
   view->SetVisible(true);
   window_manager()->GetRoot()->AddChild(view);
   ViewManager* embedded = Embed(window_manager(), view);
   ASSERT_NE(nullptr, embedded);
 
@@ skipping 338 matching lines @@
     view11->SetFocus();
     ASSERT_TRUE(DoRunLoopWithTimeout());
     ASSERT_NE(nullptr, observer.last_gained_focus());
     ASSERT_NE(nullptr, observer.last_lost_focus());
     EXPECT_EQ(view11->id(), observer.last_gained_focus()->id());
     EXPECT_EQ(embedded->GetRoot()->id(), observer.last_lost_focus()->id());
   }
 }
 
 }  // namespace mojo