Move HTMLViewer out of mojo namespace

mojo/services/html_viewer/weblayertreeview_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/services/html_viewer/weblayertreeview_impl.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/layer.h"
 #include "cc/output/begin_frame_args.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "cc/trees/layer_tree_host.h"
 #include "mojo/cc/context_provider_mojo.h"
 #include "mojo/cc/output_surface_mojo.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/services/view_manager/public/cpp/view.h"
 #include "third_party/WebKit/public/web/WebWidget.h"
 
-namespace mojo {
+namespace html_viewer {
 
 WebLayerTreeViewImpl::WebLayerTreeViewImpl(
     scoped_refptr<base::MessageLoopProxy> compositor_message_loop_proxy,
-    SurfacesServicePtr surfaces_service,
-    GpuPtr gpu_service)
+    mojo::SurfacesServicePtr surfaces_service,
+    mojo::GpuPtr gpu_service)
     : widget_(NULL),
       view_(NULL),
       surfaces_service_(surfaces_service.Pass()),
       gpu_service_(gpu_service.Pass()),
       main_thread_compositor_task_runner_(base::MessageLoopProxy::current()),
       weak_factory_(this) {
   main_thread_bound_weak_ptr_ = weak_factory_.GetWeakPtr();
   surfaces_service_->CreateSurfaceConnection(
       base::Bind(&WebLayerTreeViewImpl::OnSurfaceConnectionCreated,
                  main_thread_bound_weak_ptr_));
@@ skipping 190 matching lines @@
 }
 
 bool WebLayerTreeViewImpl::commitRequested() const {
   return layer_tree_host_->CommitRequested();
 }
 
 void WebLayerTreeViewImpl::finishAllRendering() {
   layer_tree_host_->FinishAllRendering();
 }
 
-void WebLayerTreeViewImpl::OnSurfaceConnectionCreated(SurfacePtr surface,
+void WebLayerTreeViewImpl::OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
                                                       uint32_t id_namespace) {
-  CommandBufferPtr cb;
+  mojo::CommandBufferPtr cb;
   gpu_service_->CreateOffscreenGLES2Context(GetProxy(&cb));
   scoped_refptr<cc::ContextProvider> context_provider(
-      new ContextProviderMojo(cb.PassMessagePipe()));
-  output_surface_.reset(new OutputSurfaceMojo(
+      new mojo::ContextProviderMojo(cb.PassMessagePipe()));
+  output_surface_.reset(new mojo::OutputSurfaceMojo(
       this, context_provider, surface.Pass(), id_namespace));
   layer_tree_host_->SetLayerTreeHostClientReady();
 }
 
 void WebLayerTreeViewImpl::DidCreateSurface(cc::SurfaceId id) {
   main_thread_compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread,
                  main_thread_bound_weak_ptr_,
                  id));
 }
 
 void WebLayerTreeViewImpl::DidCreateSurfaceOnMainThread(cc::SurfaceId id) {
-  view_->SetSurfaceId(SurfaceId::From(id));
+  view_->SetSurfaceId(mojo::SurfaceId::From(id));
 }
 
-}  // namespace mojo
+}  // namespace html_viewer