Rename ApplicationDelegate to ShellClient

mojo/shell/fetcher/about_fetcher_unittest.cc

 // 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 "mojo/shell/fetcher/about_fetcher.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "mojo/common/weak_binding_set.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/application_manager.h"
 #include "mojo/shell/package_manager/package_manager_impl.h"
-#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/interface_factory.h"
+#include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/interfaces/content_handler.mojom.h"
 #include "mojo/util/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace shell {
 namespace {
 
-class TestContentHandler : public ApplicationDelegate,
+class TestContentHandler : public ShellClient,
                            public InterfaceFactory<mojom::ContentHandler>,
                            public mojom::ContentHandler {
  public:
   TestContentHandler() : response_number_(0) {}
   ~TestContentHandler() override {}
 
   size_t response_number() const { return response_number_; }
   const URLResponse* latest_response() const { return latest_response_.get(); }
 
  private:
-  // Overridden from ApplicationDelegate:
+  // Overridden from ShellClient:
   void Initialize(Shell* shell, const std::string& url, uint32_t id) override {}
-  bool AcceptConnection(ApplicationConnection* connection) override {
+  bool AcceptConnection(Connection* connection) override {
     connection->AddService<mojom::ContentHandler>(this);
     return true;
   }
 
   // Overridden from InterfaceFactory<mojom::ContentHandler>:
-  void Create(ApplicationConnection* connection,
+  void Create(Connection* connection,
               InterfaceRequest<mojom::ContentHandler> request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // Overridden from mojom::ContentHandler:
   void StartApplication(
       InterfaceRequest<mojom::Application> application,
       URLResponsePtr response,
       const Callback<void()>& destruct_callback) override {
     response_number_++;
     latest_response_ = std::move(response);
     destruct_callback.Run();
 
     // Drop |application| request. This results in the application manager
     // dropping the ServiceProvider interface request provided by the client
     // who made the ConnectToApplication() call. Therefore the client could
     // listen for connection error of the ServiceProvider interface to learn
     // that StartApplication() has been called.
   }
 
   size_t response_number_;
   URLResponsePtr latest_response_;
   WeakBindingSet<mojom::ContentHandler> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
 class TestLoader : public ApplicationLoader {
  public:
-  explicit TestLoader(ApplicationDelegate* delegate) : delegate_(delegate) {}
+  explicit TestLoader(ShellClient* delegate) : delegate_(delegate) {}
   ~TestLoader() override {}
 
  private:
   // Overridden from ApplicationLoader:
   void Load(const GURL& url,
             InterfaceRequest<mojom::Application> request) override {
     app_.reset(new ApplicationImpl(delegate_, std::move(request)));
   }
 
-  ApplicationDelegate* delegate_;
+  ShellClient* delegate_;
   scoped_ptr<ApplicationImpl> app_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLoader);
 };
 
 class AboutFetcherTest : public testing::Test {
  public:
   AboutFetcherTest() {}
   ~AboutFetcherTest() override {}
 
@@ skipping 70 matching lines @@
   const URLResponse* response = html_content_handler()->latest_response();
   EXPECT_EQ("about:some_unrecognized_url", response->url);
   EXPECT_EQ(404u, response->status_code);
   EXPECT_EQ("text/html", response->mime_type);
   EXPECT_FALSE(response->body.is_valid());
 }
 
 }  // namespace
 }  // namespace shell
 }  // namespace mojo