ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/capability_filter_test.h

 // Copyright 2015 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/at_exit.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/capability_filter_unittest.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace test {
 
 class ConnectionValidator;
 
 // This class models an application who will use the shell to interact with a
 // system service. The shell may limit this application's visibility of the full
@@ skipping 20 matching lines @@
 };
 
 class TestLoader : public ApplicationLoader {
  public:
   explicit TestLoader(ShellClient* delegate);
   ~TestLoader() override;
 
  private:
   // Overridden from ApplicationLoader:
   void Load(const GURL& url,
-            InterfaceRequest<mojom::Application> request) override;
+            InterfaceRequest<mojom::ShellClient> request) override;
 
   scoped_ptr<ShellClient> delegate_;
-  scoped_ptr<ApplicationImpl> app_;
+  scoped_ptr<ShellConnection> app_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLoader);
 };
 
 class CapabilityFilterTest : public testing::Test {
  public:
    CapabilityFilterTest();
    ~CapabilityFilterTest() override;
 
  protected:
@@ skipping 34 matching lines @@
   base::MessageLoop loop_;
   scoped_ptr<ApplicationManager> application_manager_;
   ConnectionValidator* validator_;
 
   DISALLOW_COPY_AND_ASSIGN(CapabilityFilterTest);
 };
 
 }  // namespace test
 }  // namespace shell
 }  // namespace mojo