Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

base/ios/device_util_unittest.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.
 
 #import <UIKit/UIKit.h>
 
 #include "base/ios/device_util.h"
+#include "base/ios/ios_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 namespace {
 // The behavior of most of these utility functions depends on what they are run
 // on, so there is not much to unittest them. The APIs are run to make sure they
 // don't choke. Additional checks are added for particular APIs when needed.
 
@@ skipping 116 matching lines @@
   std::string base_id = ios::device_util::GetDeviceIdentifier(NULL);
   [defaults setObject:@"Foo" forKey:@"ClientIDGenerationHardwareType"];
   [defaults synchronize];
   std::string new_id = ios::device_util::GetDeviceIdentifier(NULL);
   EXPECT_NE(new_id, base_id);
 
   CleanNSUserDefaultsForDeviceId();
 }
 
 }  // namespace