Create snapshot/mac and move some files from snapshot and util to there

snapshot/mac/mach_o_image_reader.h

 // 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,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // 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>
 
 #include <map>
 #include <string>
 
 #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 {
 
 class MachOImageSegmentReader;
 class MachOImageSymbolTableReader;
 class ProcessReader;
 
 //! \brief A reader for Mach-O images mapped into another process.
 //!
 //! This class is capable of reading both 32-bit (`mach_header`/`MH_MAGIC`) and
 //! 64-bit (`mach_header_64`/`MH_MAGIC_64`) images based on the bitness of the
 //! remote process.
 class MachOImageReader {
  public:
   MachOImageReader();
   ~MachOImageReader();
 
   //! \brief Reads the Mach-O image file’s load commands from another process.
   //!
   //! This method must only be called once on an object. This method must be
   //! called successfully before any other method in this class may be called.
   //!
   //! \param[in] process_reader The reader for the remote process.
   //! \param[in] address The address, in the remote process’ address space,
   //!     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.
   //!
   //! \return `true` if the image was read successfully, including all load
   //!     commands. `false` otherwise, with an appropriate message logged.
   bool Initialize(ProcessReader* process_reader,
                   mach_vm_address_t address,
                   const std::string& name);
 
   //! \brief Returns the Mach-O file type.
@@ skipping 265 matching lines @@
   // symbol_table_initialized_ being valid doesn’t imply that symbol_table_ is
   // set. symbol_table_initialized_ will be valid without symbol_table_ being
   // set in modules that have no symbol table.
   mutable InitializationState symbol_table_initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(MachOImageReader);
 };
 
 }  // namespace crashpad
 
-#endif  // CRASHPAD_UTIL_MAC_MACH_O_IMAGE_READER_H_
+#endif  // CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_READER_H_