Make ApplicationTestBase not use ApplicationImpl.

services/prediction/prediction_apptests.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.
 
 // To test, run "out/Debug//mojo_shell mojo:prediction_apptests"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/application/connect.h"
 #include "mojo/services/prediction/interfaces/prediction.mojom.h"
 
 namespace prediction {
 
 void GetPredictionListAndEnd(std::vector<std::string>* output_list,
                              const mojo::Array<mojo::String>& input_list) {
   *output_list = input_list.To<std::vector<std::string>>();
   base::MessageLoop::current()->Quit();
 }
 
 class PredictionApptest : public mojo::test::ApplicationTestBase {
  public:
   PredictionApptest() : ApplicationTestBase() {}
 
   ~PredictionApptest() override {}
 
   void SetUp() override {
     mojo::test::ApplicationTestBase::SetUp();
-    mojo::ConnectToService(application_impl()->shell(),
-                           "mojo:prediction_service", GetProxy(&prediction_));
+    mojo::ConnectToService(shell(), "mojo:prediction_service",
+                           GetProxy(&prediction_));
   }
 
   std::vector<std::string> GetPredictionListClient(
       mojo::Array<PrevWordInfoPtr>& prev_words,
       const mojo::String& cur_word) {
     PredictionInfoPtr prediction_info = PredictionInfo::New();
     prediction_info->previous_words = prev_words.Pass();
     prediction_info->current_word = cur_word;
 
     std::vector<std::string> prediction_list;
@@ skipping 76 matching lines @@
   PrevWordInfoPtr prev_word = PrevWordInfo::New();
   prev_word->word = "This";
   prev_word->is_beginning_of_sentence = true;
   mojo::Array<PrevWordInfoPtr> prev_words =
       mojo::Array<PrevWordInfoPtr>::New(0);
   prev_words.push_back(prev_word.Pass());
   EXPECT_EQ((int)GetPredictionListClient(prev_words, "").size(), 0);
 }
 
 }  // namespace prediction