Clean up WTH creation

mojo/services/view_manager/root_view_manager.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 "mojo/services/view_manager/root_view_manager.h"
 
 #include "base/auto_reset.h"
 #include "base/scoped_observer.h"
-#include "mojo/aura/screen_mojo.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/services/view_manager/root_node_manager.h"
 #include "mojo/services/view_manager/root_view_manager_delegate.h"
+#include "mojo/services/view_manager/screen_impl.h"
 #include "mojo/services/view_manager/window_tree_host_impl.h"
 #include "ui/aura/client/default_capture_client.h"
 #include "ui/aura/client/focus_change_observer.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_tree_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 
 namespace mojo {
 namespace view_manager {
@@ skipping 84 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientImpl);
 };
 
 RootViewManager::RootViewManager(ServiceProvider* service_provider,
                                  RootNodeManager* root_node,
                                  RootViewManagerDelegate* delegate)
     : delegate_(delegate),
       root_node_manager_(root_node),
       in_setup_(false) {
-  screen_.reset(ScreenMojo::Create());
+  screen_.reset(ScreenImpl::Create());
   gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
   NativeViewportPtr viewport;
   ConnectToService(service_provider,
                    "mojo:mojo_native_viewport_service",
                    &viewport);
   window_tree_host_.reset(new WindowTreeHostImpl(
         viewport.Pass(),
         gfx::Rect(800, 600),
         base::Bind(&RootViewManager::OnCompositorCreated,
                    base::Unretained(this))));
@@ skipping 22 matching lines @@
                                focus_client_.get());
 
   window_tree_host_->Show();
 
   delegate_->OnRootViewManagerWindowTreeHostCreated();
 }
 
 }  // namespace service
 }  // namespace view_manager
 }  // namespace mojo