Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/ios/device_util.mm

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/ios/device_util.h"
 
 #include <CommonCrypto/CommonDigest.h>
 #import <UIKit/UIKit.h>
 
 #include <ifaddrs.h>
 #include <net/if_dl.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/sysctl.h>
 
+#include "base/ios/ios_util.h"
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 
 namespace {
 
 // Client ID key in the user preferences.
@@ skipping 142 matching lines @@
 
   base::ScopedCFTypeRef<CFUUIDRef> uuid_object(
       CFUUIDCreateFromUUIDBytes(kCFAllocatorDefault, *uuid_bytes));
   base::ScopedCFTypeRef<CFStringRef> device_id(
       CFUUIDCreateString(kCFAllocatorDefault, uuid_object));
   return base::SysCFStringRefToUTF8(device_id);
 }
 
 }  // namespace device_util
 }  // namespace ios