| Index: snapshot/mac/mach_o_image_reader.h
 | 
| diff --git a/util/mac/mach_o_image_reader.h b/snapshot/mac/mach_o_image_reader.h
 | 
| similarity index 98%
 | 
| rename from util/mac/mach_o_image_reader.h
 | 
| rename to snapshot/mac/mach_o_image_reader.h
 | 
| index ad39611103b8a50ab26298df495136b7fdcaf0c9..f89e9e9406bb4751d4d1cb833654e3c694ecf857 100644
 | 
| --- a/util/mac/mach_o_image_reader.h
 | 
| +++ b/snapshot/mac/mach_o_image_reader.h
 | 
| @@ -12,8 +12,8 @@
 | 
|  // See the License for the specific language governing permissions and
 | 
|  // limitations under the License.
 | 
|  
 | 
| -#ifndef CRASHPAD_UTIL_MAC_MACH_O_IMAGE_READER_H_
 | 
| -#define CRASHPAD_UTIL_MAC_MACH_O_IMAGE_READER_H_
 | 
| +#ifndef CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_READER_H_
 | 
| +#define CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_READER_H_
 | 
|  
 | 
|  #include <mach/mach.h>
 | 
|  #include <stdint.h>
 | 
| @@ -23,10 +23,10 @@
 | 
|  
 | 
|  #include "base/basictypes.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
| +#include "snapshot/mac/process_types.h"
 | 
|  #include "util/misc/initialization_state_dcheck.h"
 | 
|  #include "util/misc/uuid.h"
 | 
|  #include "util/stdlib/pointer_container.h"
 | 
| -#include "util/mac/process_types.h"
 | 
|  
 | 
|  namespace crashpad {
 | 
|  
 | 
| @@ -54,7 +54,7 @@ class MachOImageReader {
 | 
|    //!     where the `mach_header` or `mach_header_64` at the beginning of the
 | 
|    //!     image to be read is located. This address can be determined by reading
 | 
|    //!     the remote process’ dyld information (see
 | 
| -  //!     util/mac/process_types/dyld_images.proctype).
 | 
| +  //!     snapshot/mac/process_types/dyld_images.proctype).
 | 
|    //! \param[in] name The module’s name, a string to be used in logged messages.
 | 
|    //!     This string is for diagnostic purposes only, and may be empty.
 | 
|    //!
 | 
| @@ -340,4 +340,4 @@ class MachOImageReader {
 | 
|  
 | 
|  }  // namespace crashpad
 | 
|  
 | 
| -#endif  // CRASHPAD_UTIL_MAC_MACH_O_IMAGE_READER_H_
 | 
| +#endif  // CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_READER_H_
 | 
| 
 |