Simplify the organization of //mojo_file_utils.

mojo/file_utils/file_util_unittest.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 <vector>
 
 #include "mojo/file_utils/file_util.h"
-#include "mojo/file_utils/tests/file_util_test_base.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/application/application_test_base.h"
 #include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/services/files/interfaces/directory.mojom.h"
 #include "mojo/services/files/interfaces/file.mojom.h"
 #include "mojo/services/files/interfaces/files.mojom.h"
 
 namespace file_utils {
 namespace test {
 namespace {
 
-using FileUtilTest = file_utils::test::FileUtilTestBase;
+using FileUtilTest = mojo::test::ApplicationTestBase;
 
 // TODO(smklein): Stuff copied from mojo/services/files/c/lib/template_util.h
 typedef char YesType;
 
 struct NoType {
   YesType dummy[2];
 };
 
 template <typename T>
 struct IsMoveOnlyType {
@@ skipping 96 matching lines @@
 
 // Close the FilePtr |file| and verify that no error occurs.
 void CloseFileHelper(mojo::files::FilePtr* file) {
   mojo::files::Error error = mojo::files::Error::INTERNAL;
   (*file)->Close(Capture(&error));
   ASSERT_TRUE(file->WaitForIncomingResponse());
   EXPECT_EQ(mojo::files::Error::OK, error);
 }
 
 TEST_F(FileUtilTest, BasicCreateTemporaryFile) {
+  mojo::files::FilesPtr files;
+  application_impl()->ConnectToService("mojo:files", &files);
+
   mojo::files::Error error = mojo::files::Error::INTERNAL;
   mojo::files::DirectoryPtr directory;
-  files()->OpenFileSystem(nullptr, mojo::GetProxy(&directory), Capture(&error));
+  files->OpenFileSystem(nullptr, mojo::GetProxy(&directory), Capture(&error));
 
-  ASSERT_TRUE(files().WaitForIncomingResponse());
+  ASSERT_TRUE(files.WaitForIncomingResponse());
   EXPECT_EQ(mojo::files::Error::OK, error);
 
   std::string filename1, filename2, filename3;
   mojo::files::FilePtr file1, file2, file3;
   file1 = CreateTemporaryFileInDir(&directory, &filename1);
   ASSERT_TRUE(file1);
   file2 = CreateTemporaryFileInDir(&directory, &filename2);
   ASSERT_TRUE(file2);
   file3 = CreateTemporaryFileInDir(&directory, &filename3);
   ASSERT_TRUE(file3);
@@ skipping 35 matching lines @@
 
   // Test that the files can be closed once more.
   CloseFileHelper(&file1);
   CloseFileHelper(&file2);
   CloseFileHelper(&file3);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace file_utils