test: Move util/test to its own top-level directory, test

test/paths_test.cc

Index: test/paths_test.cc
diff --git a/util/test/paths_test.cc b/test/paths_test.cc
similarity index 84%
rename from util/test/paths_test.cc
rename to test/paths_test.cc
index 466e8b689b6c2c72f92872e86e618b879e9c55ab..7cbca049e70f68e2e5715c380036faf62697dc87 100644
--- a/util/test/paths_test.cc
+++ b/test/paths_test.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "util/test/paths.h"
+#include "test/paths.h"
 
 #include "base/files/file_path.h"
 #include "build/build_config.h"
@@ -27,18 +27,17 @@ TEST(Paths, Executable) {
   base::FilePath executable_path = Paths::Executable();
   base::FilePath executable_name = executable_path.BaseName();
 #if defined(OS_WIN)
-  EXPECT_EQ(FILE_PATH_LITERAL("crashpad_util_test.exe"),
+  EXPECT_EQ(FILE_PATH_LITERAL("crashpad_test_test.exe"),
             executable_name.value());
 #else
-  EXPECT_EQ("crashpad_util_test", executable_name.value());
+  EXPECT_EQ("crashpad_test_test", executable_name.value());
 #endif  // OS_WIN
 }
 
 TEST(Paths, TestDataRoot) {
   base::FilePath test_data_root = Paths::TestDataRoot();
   ScopedFileHandle file(LoggingOpenFileForRead(
-      test_data_root.Append(FILE_PATH_LITERAL("util"))
-          .Append(FILE_PATH_LITERAL("test"))
+      test_data_root.Append(FILE_PATH_LITERAL("test"))
           .Append(FILE_PATH_LITERAL("paths_test_data_root.txt"))));
   EXPECT_TRUE(file.is_valid());
 }