Rename ApplicationDelegate to ShellClient

components/web_view/frame_apptest.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 "components/web_view/frame.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/web_view/frame_connection.h"
 #include "components/web_view/frame_tree.h"
 #include "components/web_view/frame_tree_delegate.h"
 #include "components/web_view/frame_user_data.h"
 #include "components/web_view/test_frame_tree_delegate.h"
-#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_delegate.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
-#include "mojo/shell/public/cpp/service_provider_impl.h"
 
 using mus::Window;
 using mus::WindowTreeConnection;
 
 namespace web_view {
 
 namespace {
 
 base::RunLoop* current_run_loop = nullptr;
 
@@ skipping 236 matching lines @@
 
   mus::Window* window_;
   base::RunLoop run_loop_;
   TestFrameClient test_frame_tree_client_;
   mojo::Binding<mojom::FrameClient> frame_client_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowAndFrame);
 };
 
 class FrameTest : public mojo::test::ApplicationTestBase,
-                  public mojo::ApplicationDelegate,
+                  public mojo::ShellClient,
                   public mus::WindowTreeDelegate,
                   public mojo::InterfaceFactory<mus::mojom::WindowTreeClient>,
                   public mojo::InterfaceFactory<mojom::FrameClient> {
  public:
   FrameTest() : most_recent_connection_(nullptr), window_manager_(nullptr) {}
 
   WindowTreeConnection* most_recent_connection() {
     return most_recent_connection_;
   }
 
@@ skipping 46 matching lines @@
   // frame has been obtained.
   scoped_ptr<WindowAndFrame> WaitForViewAndFrame() {
     DCHECK(!window_and_frame_);
     window_and_frame_.reset(new WindowAndFrame);
     window_and_frame_->WaitForViewAndFrame();
     return std::move(window_and_frame_);
   }
 
  private:
   // ApplicationTestBase:
-  ApplicationDelegate* GetApplicationDelegate() override { return this; }
+  mojo::ShellClient* GetShellClient() override { return this; }
 
-  // ApplicationDelegate implementation.
-  bool AcceptConnection(
-      mojo::ApplicationConnection* connection) override {
+  // mojo::ShellClient implementation.
+  bool AcceptConnection(mojo::Connection* connection) override {
     connection->AddService<mus::mojom::WindowTreeClient>(this);
     connection->AddService<mojom::FrameClient>(this);
     return true;
   }
 
   // Overridden from WindowTreeDelegate:
   void OnEmbed(Window* root) override {
     most_recent_connection_ = root->connection();
     QuitRunLoop();
   }
@@ skipping 28 matching lines @@
   // Overridden from testing::Test:
   void TearDown() override {
     root_window_and_frame_.reset();
     frame_tree_.reset();
     frame_tree_delegate_.reset();
     ApplicationTestBase::TearDown();
   }
 
   // Overridden from mojo::InterfaceFactory<mus::mojom::WindowTreeClient>:
   void Create(
-      mojo::ApplicationConnection* connection,
+      mojo::Connection* connection,
       mojo::InterfaceRequest<mus::mojom::WindowTreeClient> request) override {
     if (window_and_frame_) {
       mus::WindowTreeConnection::Create(
           window_and_frame_.get(), std::move(request),
           mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
     } else {
       mus::WindowTreeConnection::Create(
           this, std::move(request),
           mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
     }
   }
 
   // Overridden from mojo::InterfaceFactory<mojom::FrameClient>:
-  void Create(mojo::ApplicationConnection* connection,
+  void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<mojom::FrameClient> request) override {
     ASSERT_TRUE(window_and_frame_);
     window_and_frame_->Bind(std::move(request));
   }
 
   scoped_ptr<TestFrameTreeDelegate> frame_tree_delegate_;
   scoped_ptr<FrameTree> frame_tree_;
   scoped_ptr<WindowAndFrame> root_window_and_frame_;
 
   mus::mojom::WindowTreeHostPtr host_;
@@ skipping 140 matching lines @@
   base::TimeTicks navigation_start_time = base::TimeTicks::FromInternalValue(1);
   scoped_ptr<WindowAndFrame> navigated_child_view_and_frame =
       NavigateFrameWithStartTime(child_view_and_frame.get(),
                                  navigation_start_time);
   EXPECT_EQ(navigation_start_time,
             navigated_child_view_and_frame->test_frame_client()
                 ->last_navigation_start_time());
 }
 
 }  // namespace web_view