Clean up WTH creation

mojo/services/view_manager/screen_impl.h

Index: mojo/services/view_manager/screen_impl.h
diff --git a/mojo/aura/screen_mojo.h b/mojo/services/view_manager/screen_impl.h
similarity index 71%
copy from mojo/aura/screen_mojo.h
copy to mojo/services/view_manager/screen_impl.h
index ad50c1cee71166f6628fb0b70841e84a7bc57000..3a1a42f03b64bcef7cf6d1a39635bab9266b9911 100644
--- a/mojo/aura/screen_mojo.h
+++ b/mojo/services/view_manager/screen_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_AURA_SCREEN_MOJO_H_
-#define MOJO_AURA_SCREEN_MOJO_H_
+#ifndef MOJO_SERVICES_VIEW_MANAGER_SCREEN_IMPL_H_
+#define MOJO_SERVICES_VIEW_MANAGER_SCREEN_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "ui/gfx/display.h"
@@ -15,12 +15,14 @@ class Transform;
 }
 
 namespace mojo {
+namespace view_manager {
+namespace service {
 
-// A minimal implementation of gfx::Screen for mojo.
-class ScreenMojo : public gfx::Screen {
+// A minimal implementation of gfx::Screen for the view manager.
+class ScreenImpl : public gfx::Screen {
  public:
-  static ScreenMojo* Create();
-  virtual ~ScreenMojo();
+  static gfx::Screen* Create();
+  virtual ~ScreenImpl();
 
  protected:
   // gfx::Screen overrides:
@@ -42,13 +44,15 @@ class ScreenMojo : public gfx::Screen {
   virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE;
 
  private:
-  explicit ScreenMojo(const gfx::Rect& screen_bounds);
+  explicit ScreenImpl(const gfx::Rect& screen_bounds);
 
   gfx::Display display_;
 
-  DISALLOW_COPY_AND_ASSIGN(ScreenMojo);
+  DISALLOW_COPY_AND_ASSIGN(ScreenImpl);
 };
 
+}  // namespace service
+}  // namespace view_manager
 }  // namespace mojo
 
-#endif  // MOJO_AURA_SCREEN_MOJO_H_
+#endif  // MOJO_SERVICES_VIEW_MANAGER_SCREEN_IMPL_H_