Replace ApplicationImpl::CreateApplicationConnector() with a standalone helper function.

mojo/public/cpp/application/lib/application_test_base.cc

 // Copyright 2014 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/public/cpp/application/application_test_base.h"
 
 #include <utility>
 
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 #include "mojo/public/interfaces/application/application.mojom.h"
 
 namespace mojo {
 namespace test {
 
 namespace {
+
 // Share the application command-line arguments with multiple application tests.
 Array<String> g_args;
 
 // Share the application URL with multiple application tests.
 String g_url;
 
 // Application request handle passed from the shell in MojoMain, stored in
 // between SetUp()/TearDown() so we can (re-)intialize new ApplicationImpls.
 InterfaceRequest<Application> g_application_request;
 
 // Shell pointer passed in the initial mojo.Application.Initialize() call,
 // stored in between initial setup and the first test and between SetUp/TearDown
 // calls so we can (re-)initialize new ApplicationImpls.
 ShellPtr g_shell;
 
-void InitializeArgs(int argc, std::vector<const char*> argv) {
+void InitializeArgs(int argc, const char** argv) {
   MOJO_CHECK(g_args.is_null());
-  for (const char* arg : argv) {
-    if (arg)
-      g_args.push_back(arg);
+  for (int i = 0; i < argc; i++) {
+    MOJO_CHECK(argv[i]);
+    g_args.push_back(argv[i]);
   }
 }
 
 class ShellAndArgumentGrabber : public Application {
  public:
   ShellAndArgumentGrabber(Array<String>* args,
                           InterfaceRequest<Application> application_request)
       : args_(args), binding_(this, application_request.Pass()) {}
 
   void WaitForInitialize() {
@@ skipping 51 matching lines @@
     // InitGoogleTest expects (argc + 1) elements, including a terminating null.
     // It also removes GTEST arguments from |argv| and updates the |argc| count.
     MOJO_CHECK(args.size() <
                static_cast<size_t>(std::numeric_limits<int>::max()));
     int argc = static_cast<int>(args.size());
     std::vector<const char*> argv(argc + 1);
     for (int i = 0; i < argc; ++i)
       argv[i] = args[i].get().c_str();
     argv[argc] = nullptr;
 
-    testing::InitGoogleTest(&argc, const_cast<char**>(&(argv[0])));
-    InitializeArgs(argc, argv);
+    // Note: |InitGoogleTest()| will modify |argc| and |argv[...]|.
+    testing::InitGoogleTest(&argc, const_cast<char**>(&argv[0]));
+    InitializeArgs(argc, &argv[0]);
 
     Environment::DestroyDefaultRunLoop();
   }
 
   int result = RUN_ALL_TESTS();
 
   // Shut down our message pipes before exiting.
   (void)g_application_request.PassMessagePipe();
   (void)g_shell.PassInterfaceHandle();
 
@@ skipping 36 matching lines @@
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 }  // namespace test
 }  // namespace mojo