Use the mojo::shell namespace consistently underly shell/.

services/window_manager/window_manager_api_unittest.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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 49 matching lines @@
       active_window_changed_callback_.Run(active_window);
   }
 
   NodeIdCallback focus_changed_callback_;
   NodeIdCallback active_window_changed_callback_;
   mojo::Binding<WindowManagerObserver> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowManagerObserver);
 };
 
-class TestApplicationLoader : public mojo::ApplicationLoader,
+class TestApplicationLoader : public mojo::shell::ApplicationLoader,
                               public mojo::ApplicationDelegate,
                               public mojo::ViewManagerDelegate {
  public:
   typedef base::Callback<void(View*)> RootAddedCallback;
 
   explicit TestApplicationLoader(const RootAddedCallback& root_added_callback)
       : root_added_callback_(root_added_callback) {}
   ~TestApplicationLoader() override {}
 
  private:
-  // Overridden from mojo::ApplicationLoader:
+  // Overridden from mojo::shell::ApplicationLoader:
   void Load(
       const GURL& url,
       mojo::InterfaceRequest<mojo::Application> application_request) override {
     ASSERT_TRUE(application_request.is_pending());
     scoped_ptr<ApplicationImpl> app(
         new ApplicationImpl(this, application_request.Pass()));
     apps_.push_back(app.release());
   }
 
   // Overridden from mojo::ApplicationDelegate:
@@ skipping 79 matching lines @@
   mojo::WindowManagerPtr window_manager_;
 
  private:
   // Overridden from testing::Test:
   void SetUp() override {
     test_helper_.reset(new mojo::shell::ShellTestHelper);
     test_helper_->Init();
     test_helper_->AddURLMapping(GURL("mojo:window_manager"),
                                 GURL("mojo:core_window_manager"));
     test_helper_->SetLoaderForURL(
-        scoped_ptr<mojo::ApplicationLoader>(
+        scoped_ptr<mojo::shell::ApplicationLoader>(
             new TestApplicationLoader(base::Bind(
                 &WindowManagerApiTest::OnRootAdded, base::Unretained(this)))),
         GURL(kTestServiceURL));
     ConnectToWindowManager2();
   }
   void TearDown() override {}
 
   void ConnectToWindowManager2() {
     test_helper_->application_manager()->ConnectToService(
         GURL("mojo:window_manager"), &window_manager_);
@@ skipping 59 matching lines @@
   EXPECT_EQ(id, first_window);
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   id = WaitForActiveWindowChange();
   EXPECT_EQ(id, second_window);
 }
 
 }  // namespace window_manager