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

snapshot/mac/mach_o_image_reader_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 13 matching lines @@
 #include <mach-o/nlist.h>
 #include <stdint.h>
 
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
 #include "client/crashpad_info.h"
 #include "gtest/gtest.h"
 #include "snapshot/mac/mach_o_image_segment_reader.h"
 #include "snapshot/mac/process_reader.h"
 #include "snapshot/mac/process_types.h"
+#include "test/mac/dyld.h"
 #include "util/misc/uuid.h"
-#include "util/test/mac/dyld.h"
 
 // This file is responsible for testing MachOImageReader,
 // MachOImageSegmentReader, and MachOImageSymbolTableReader.
 
 namespace crashpad {
 namespace test {
 namespace {
 
 // Native types and constants, in cases where the 32-bit and 64-bit versions
 // are different.
@@ skipping 589 matching lines @@
       image_reader.UUID(&actual_uuid);
       EXPECT_EQ(expected_uuid, actual_uuid);
     }
   }
 #endif
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad