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

snapshot/mac/mach_o_image_segment_reader.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,
 // 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.
 
-#include "util/mac/mach_o_image_segment_reader.h"
+#include "snapshot/mac/mach_o_image_segment_reader.h"
 
 #include <mach-o/loader.h>
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
+#include "snapshot/mac/process_reader.h"
 #include "util/mac/checked_mach_address_range.h"
-#include "util/mac/process_reader.h"
 #include "util/stdlib/strnlen.h"
 
 namespace crashpad {
 
 namespace {
 
 std::string SizeLimitedCString(const char* c_string, size_t max_length) {
   return std::string(c_string, strnlen(c_string, max_length));
 }
 
@@ skipping 39 matching lines @@
                         kRequiredSize) << load_command_info;
     return false;
   }
 
   std::string segment_name = NameInternal();
   std::string segment_info = base::StringPrintf(
       ", segment %s%s", segment_name.c_str(), load_command_info.c_str());
 
   // This checks the unslid segment range. The slid range (as loaded into
   // memory) will be checked later by MachOImageReader.
-  CheckedMachAddressRange segment_range(
-      process_reader, segment_command_.vmaddr, segment_command_.vmsize);
+  CheckedMachAddressRange segment_range(process_reader->Is64Bit(),
+                                        segment_command_.vmaddr,
+                                        segment_command_.vmsize);
   if (!segment_range.IsValid()) {
     LOG(WARNING) << base::StringPrintf("invalid segment range 0x%llx + 0x%llx",
                                        segment_command_.vmaddr,
                                        segment_command_.vmsize) << segment_info;
     return false;
   }
 
   sections_.resize(segment_command_.nsects);
   if (!process_types::section::ReadArrayInto(
           process_reader,
@@ skipping 19 matching lines @@
                                                   sections_.size(),
                                                   load_command_info.c_str());
 
     if (section_segment_name != segment_name) {
       LOG(WARNING) << "section.segname incorrect in segment " << segment_name
                    << section_info;
       return false;
     }
 
     CheckedMachAddressRange section_range(
-        process_reader, section.addr, section.size);
+        process_reader->Is64Bit(), section.addr, section.size);
     if (!section_range.IsValid()) {
       LOG(WARNING) << base::StringPrintf(
                           "invalid section range 0x%llx + 0x%llx",
                           section.addr,
                           section.size) << section_info;
       return false;
     }
 
     if (!segment_range.ContainsRange(section_range)) {
       LOG(WARNING) << base::StringPrintf(
@@ skipping 132 matching lines @@
 }
 
 void MachOImageSegmentReader::SetSlide(mach_vm_size_t slide) {
   INITIALIZATION_STATE_DCHECK_VALID(initialized_);
   INITIALIZATION_STATE_SET_INITIALIZING(initialized_slide_);
   slide_ = slide;
   INITIALIZATION_STATE_SET_VALID(initialized_slide_);
 }
 
 }  // namespace crashpad