Remove extraneous namespaces

mojo/examples/surfaces_app/embedder.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/embedder.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/solid_color_draw_quad.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "mojo/examples/surfaces_app/surfaces_util.h"
 #include "mojo/services/public/cpp/surfaces/surfaces_type_converters.h"
 #include "mojo/services/public/interfaces/surfaces/surface_id.mojom.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 
 namespace mojo {
 namespace examples {
 
 using cc::RenderPass;
 using cc::SurfaceDrawQuad;
 using cc::DrawQuad;
 using cc::SolidColorDrawQuad;
 using cc::DelegatedFrameData;
 using cc::CompositorFrame;
 
-Embedder::Embedder(surfaces::Surface* surface) : surface_(surface) {
+Embedder::Embedder(Surface* surface) : surface_(surface) {
 }
 
 Embedder::~Embedder() {
 }
 
 void Embedder::ProduceFrame(cc::SurfaceId child_one,
                             cc::SurfaceId child_two,
                             const gfx::Size& child_size,
                             const gfx::Size& size,
                             double rotation_degrees) {
@@ skipping 37 matching lines @@
                      rect,
                      SK_ColorYELLOW,
                      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));
+  surface_->SubmitFrame(mojo::SurfaceId::From(id_),
+                        mojo::Frame::From(*frame));
 }
 
 }  // namespace examples
 }  // namespace mojo