ApplicationImpl::ConnectToServiceDeprecated() -> mojo::ConnectToService() conversion, part 2.

services/files/files_test_base.cc

Index: services/files/files_test_base.cc
diff --git a/services/files/files_test_base.cc b/services/files/files_test_base.cc
index e1826f11317351542230494e223865c223ddd736..87ac709756635cf2cb0fb88c7f610053c1499436 100644
--- a/services/files/files_test_base.cc
+++ b/services/files/files_test_base.cc
@@ -5,6 +5,7 @@
 #include "services/files/files_test_base.h"
 
 #include "mojo/public/cpp/application/application_impl.h"
+#include "mojo/public/cpp/application/connect.h"
 #include "mojo/services/files/interfaces/files.mojom.h"
 #include "mojo/services/files/interfaces/types.mojom.h"
 
@@ -17,11 +18,8 @@ FilesTestBase::~FilesTestBase() {}
 
 void FilesTestBase::SetUp() {
   test::ApplicationTestBase::SetUp();
-  // TODO(vtl): Fix this.
-  FilesPtr files_async;
-  application_impl()->ConnectToServiceDeprecated("mojo:files", &files_async);
-  files_ =
-      SynchronousInterfacePtr<Files>::Create(files_async.PassInterfaceHandle());
+  ConnectToService(application_impl()->shell(), "mojo:files",
+                   GetSynchronousProxy(&files_));
 }
 
 void FilesTestBase::GetTemporaryRoot(