Remove extraneous namespaces

mojo/examples/surfaces_app/child_impl.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/examples/surfaces_app/child_impl.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
@@ skipping 15 matching lines @@
 using cc::SolidColorDrawQuad;
 using cc::DelegatedFrameData;
 using cc::CompositorFrame;
 
 ChildImpl::ChildImpl(ApplicationConnection* surfaces_service_connection) {
   surfaces_service_connection->ConnectToService(&surface_);
   surface_.set_client(this);
 }
 
 ChildImpl::~ChildImpl() {
-  surface_->DestroySurface(mojo::surfaces::SurfaceId::From(id_));
+  surface_->DestroySurface(mojo::SurfaceId::From(id_));
 }
 
 void ChildImpl::ProduceFrame(
-    surfaces::ColorPtr color,
+    ColorPtr color,
     SizePtr size,
-    const mojo::Callback<void(surfaces::SurfaceIdPtr id)>& callback) {
+    const mojo::Callback<void(SurfaceIdPtr id)>& callback) {
   color_ = color.To<SkColor>();
   size_ = size.To<gfx::Size>();
   produce_callback_ = callback;
   if (allocator_)
     Draw();
 }
 
 void ChildImpl::SetIdNamespace(uint32_t id_namespace) {
   allocator_.reset(new cc::SurfaceIdAllocator(id_namespace));
   if (!produce_callback_.is_null())
     Draw();
 }
 
 void ChildImpl::ReturnResources(
-    Array<surfaces::ReturnedResourcePtr> resources) {
+    Array<ReturnedResourcePtr> resources) {
   DCHECK(!resources.size());
 }
 
 void ChildImpl::Draw() {
   id_ = allocator_->GenerateId();
-  surface_->CreateSurface(mojo::surfaces::SurfaceId::From(id_),
+  surface_->CreateSurface(mojo::SurfaceId::From(id_),
                           mojo::Size::From(size_));
   gfx::Rect rect(size_);
   RenderPass::Id id(1, 1);
   scoped_ptr<RenderPass> pass = RenderPass::Create();
   pass->SetNew(id, rect, rect, gfx::Transform());
 
   CreateAndAppendSimpleSharedQuadState(pass.get(), gfx::Transform(), size_);
 
   SolidColorDrawQuad* color_quad =
       pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   bool force_anti_aliasing_off = false;
   color_quad->SetNew(pass->shared_quad_state_list.back(),
                      rect,
                      rect,
                      color_,
                      force_anti_aliasing_off);
 
   scoped_ptr<DelegatedFrameData> delegated_frame_data(new DelegatedFrameData);
   delegated_frame_data->render_pass_list.push_back(pass.Pass());
 
   scoped_ptr<CompositorFrame> frame(new CompositorFrame);
   frame->delegated_frame_data = delegated_frame_data.Pass();
 
-  surface_->SubmitFrame(mojo::surfaces::SurfaceId::From(id_),
-                        mojo::surfaces::Frame::From(*frame));
-  produce_callback_.Run(surfaces::SurfaceId::From(id_));
+  surface_->SubmitFrame(mojo::SurfaceId::From(id_),
+                        mojo::Frame::From(*frame));
+  produce_callback_.Run(SurfaceId::From(id_));
 }
 
 }  // namespace examples
 }  // namespace mojo