A few more spurious cleanups on ApplicationImpl.

mojo/application/public/cpp/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/application/public/cpp/application_test_base.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
@@ skipping 112 matching lines @@
     Environment::InstantiateDefaultRunLoop();
 
   MOJO_CHECK(g_application_request.is_pending());
   MOJO_CHECK(g_shell);
 
   // New applications are constructed for each test to avoid persisting state.
   application_impl_ = new ApplicationImpl(GetApplicationDelegate(),
                                           g_application_request.Pass());
 
   // Fake application initialization.
-  application_impl_->Initialize(g_shell.Pass(), g_url);
+  Application* application = application_impl_;
+  application->Initialize(g_shell.Pass(), g_url);
 }
 
 void ApplicationTestBase::TearDown() {
   MOJO_CHECK(!g_application_request.is_pending());
   MOJO_CHECK(!g_shell);
 
-  application_impl_->UnbindConnections(&g_application_request, &g_shell);
+  {
+    ApplicationImpl::TestApi test_api(application_impl_);
+    test_api.UnbindConnections(&g_application_request, &g_shell);
+  }
   delete application_impl_;
   if (ShouldCreateDefaultRunLoop())
     Environment::DestroyDefaultRunLoop();
 }
 
 bool ApplicationTestBase::ShouldCreateDefaultRunLoop() {
   return true;
 }
 
 
 }  // namespace test
 }  // namespace mojo