Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

mojo/shell/standalone/shell_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 <stdint.h>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/services/http_server/public/cpp/http_server_util.h"
 #include "mojo/services/http_server/public/interfaces/http_server.mojom.h"
 #include "mojo/services/http_server/public/interfaces/http_server_factory.mojom.h"
 #include "mojo/services/network/public/interfaces/net_address.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/application_test_base.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/standalone/kPingable.h"
 #include "mojo/shell/standalone/test/pingable.mojom.h"
 
 namespace mojo {
 namespace {
 
 std::string GetURL(uint16_t port, const std::string& path) {
   return base::StringPrintf("http://127.0.0.1:%u/%s",
                             static_cast<unsigned>(port), path.c_str());
 }
@@ skipping 37 matching lines @@
 class ShellHTTPAppTest : public test::ApplicationTestBase {
  public:
   ShellHTTPAppTest() : ApplicationTestBase() {}
   ~ShellHTTPAppTest() override {}
 
  protected:
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
 
-    application_impl()->ConnectToService("mojo:http_server",
-                                         &http_server_factory_);
+    shell()->ConnectToService("mojo:http_server", &http_server_factory_);
 
     NetAddressPtr local_address(NetAddress::New());
     local_address->family = NET_ADDRESS_FAMILY_IPV4;
     local_address->ipv4 = NetAddressIPv4::New();
     local_address->ipv4->addr.resize(4);
     local_address->ipv4->addr[0] = 127;
     local_address->ipv4->addr[1] = 0;
     local_address->ipv4->addr[2] = 0;
     local_address->ipv4->addr[3] = 1;
     local_address->ipv4->port = 0;
@@ skipping 19 matching lines @@
   scoped_ptr<GetHandler> handler_;
   uint16_t port_;
 
  private:
   MOJO_DISALLOW_COPY_AND_ASSIGN(ShellHTTPAppTest);
 };
 
 // Test that we can load apps over http.
 TEST_F(ShellHTTPAppTest, Http) {
   InterfacePtr<Pingable> pingable;
-  application_impl()->ConnectToService(GetURL("app"), &pingable);
+  shell()->ConnectToService(GetURL("app"), &pingable);
   pingable->Ping("hello",
                  [this](const String& app_url, const String& connection_url,
                         const String& message) {
                    EXPECT_EQ(GetURL("app"), app_url);
                    EXPECT_EQ(GetURL("app"), connection_url);
                    EXPECT_EQ("hello", message);
                    base::MessageLoop::current()->QuitWhenIdle();
                  });
   base::RunLoop().Run();
 }
 
 // Test that redirects work.
 // TODO(aa): Test that apps receive the correct URL parameters.
 TEST_F(ShellHTTPAppTest, Redirect) {
   InterfacePtr<Pingable> pingable;
-  application_impl()->ConnectToService(GetURL("redirect"), &pingable);
+  shell()->ConnectToService(GetURL("redirect"), &pingable);
   pingable->Ping("hello",
                  [this](const String& app_url, const String& connection_url,
                         const String& message) {
                    EXPECT_EQ(GetURL("app"), app_url);
                    EXPECT_EQ(GetURL("app"), connection_url);
                    EXPECT_EQ("hello", message);
                    base::MessageLoop::current()->QuitWhenIdle();
                  });
   base::RunLoop().Run();
 }
 
 // Test that querystring is not considered when resolving http applications.
 // TODO(aa|qsr): Fix this test on Linux ASAN http://crbug.com/463662
 #if defined(ADDRESS_SANITIZER)
 #define MAYBE_QueryHandling DISABLED_QueryHandling
 #else
 #define MAYBE_QueryHandling QueryHandling
 #endif  // ADDRESS_SANITIZER
 TEST_F(ShellHTTPAppTest, MAYBE_QueryHandling) {
   InterfacePtr<Pingable> pingable1;
   InterfacePtr<Pingable> pingable2;
-  application_impl()->ConnectToService(GetURL("app?foo"), &pingable1);
-  application_impl()->ConnectToService(GetURL("app?bar"), &pingable2);
+  shell()->ConnectToService(GetURL("app?foo"), &pingable1);
+  shell()->ConnectToService(GetURL("app?bar"), &pingable2);
 
   int num_responses = 0;
   auto callback = [this, &num_responses](const String& app_url,
                                          const String& connection_url,
                                          const String& message) {
     EXPECT_EQ(GetURL("app"), app_url);
     EXPECT_EQ("hello", message);
     ++num_responses;
     if (num_responses == 1) {
       EXPECT_EQ(GetURL("app?foo"), connection_url);
     } else if (num_responses == 2) {
       EXPECT_EQ(GetURL("app?bar"), connection_url);
       base::MessageLoop::current()->QuitWhenIdle();
     } else {
       CHECK(false);
     }
   };
   pingable1->Ping("hello", callback);
   pingable2->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 // mojo: URLs can have querystrings too
 TEST_F(ShellAppTest, MojoURLQueryHandling) {
   InterfacePtr<Pingable> pingable;
-  application_impl()->ConnectToService("mojo:pingable_app?foo", &pingable);
+  shell()->ConnectToService("mojo:pingable_app?foo", &pingable);
   auto callback = [this](const String& app_url, const String& connection_url,
                          const String& message) {
     EXPECT_TRUE(base::EndsWith(app_url, "/pingable_app.mojo",
                                base::CompareCase::SENSITIVE));
     EXPECT_EQ(app_url.To<std::string>() + "?foo", connection_url);
     EXPECT_EQ("hello", message);
     base::MessageLoop::current()->QuitWhenIdle();
   };
   pingable->Ping("hello", callback);
   base::RunLoop().Run();
 }
 
 }  // namespace
 }  // namespace mojo