Cleanup iOS upstreamed code

- remove unused consumer code wrapping base/ios/ios_util.h
- remove superfluous #include of base/ios/ios_util.h

BUG=429756
TBR=thakis

Review URL: https://codereview.chromium.org/940033003

Cr-Commit-Position: refs/heads/master@{#317054}

base/ios/device_util.mm

@@ -13,7 +13,6 @@
 #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"

base/ios/device_util_unittest.mm

@@ -5,7 +5,6 @@
 #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"

components/policy/core/common/policy_loader_ios_unittest.mm

@@ -7,7 +7,6 @@
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/ios/ios_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/values.h"

ios/chrome/browser/snapshots/snapshot_cache.mm

@@ -20,7 +20,6 @@
 #include "base/threading/thread_restrictions.h"
 #include "ios/chrome/browser/ui/ui_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
-#include "ios/public/consumer/base/util.h"
 #include "ios/web/public/web_thread.h"
 
 @interface SnapshotCache ()

ios/chrome/browser/ui/uikit_ui_util_unittest.mm

@@ -5,7 +5,6 @@
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
 
 #include "base/basictypes.h"
-#include "base/ios/ios_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #import "ios/chrome/browser/ui/ui_util.h"

ios/consumer/OWNERS

-sdefresne@chromium.org
-stuartmorgan@chromium.org

ios/consumer/README.txt

-This directory exists to allow iOS code that is not yet upstreamed to call
-Chromium code without being vulnerable to breakage during a merge.
-Specifically, not-yet-upstreamed code is allowed to use the interfaces
-provided in public/. Any change to one of these interfaces should get a full
-review from an OWNER, as such a change will require corresponding changes to
-code not yet upstreamed. Any change to code not under public/ can be TBR'd to
-an OWNER.

ios/consumer/base/util.mm

-// Copyright 2013 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/ios_util.h"
-#include "ios/public/consumer/base/util.h"
-
-namespace ios {
-
-bool IsRunningOnOrLater(int major, int minor, int bug_fix) {
-  return base::ios::IsRunningOnOrLater(major, minor, bug_fix);
-}
-
-}  // namespace ios

ios/ios.gyp

@@ -11,7 +11,6 @@
       'type': 'none',
       'dependencies': [
         'chrome/ios_chrome_tests.gyp:*',
-        'ios_base.gyp:*',
         'ios_tests_unit.gyp:*',
         'provider/ios_provider_chrome.gyp:*',
         'provider/ios_provider_web.gyp:*',

ios/ios_base.gyp

-# Copyright 2013 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.
-{
-  'variables': {
-    'chromium_code': 1,
-   },
-  'targets': [
-    {
-      'target_name': 'ios_consumer_base',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'consumer/base/util.mm',
-      ],
-    },
-  ],
-}

ios/ios_tests_unit.gyp

@@ -15,7 +15,6 @@
         '../base/base.gyp:test_support_base',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        'ios_base.gyp:ios_consumer_base',
         'web/ios_web.gyp:ios_web',
         'web/ios_web.gyp:test_support_ios_web',
       ],

ios/public/consumer/OWNERS

-sdefresne@chromium.org
-stuartmorgan@chromium.org

ios/public/consumer/base/util.h

-// Copyright 2013 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.
-
-#ifndef IOS_PUBLIC_CONSUMER_BASE_UTIL_H_
-#define IOS_PUBLIC_CONSUMER_BASE_UTIL_H_
-
-namespace ios {
-
-// Returns whether the operating system is at the given version or later.
-bool IsRunningOnOrLater(int major, int minor, int bug_fix);
-
-}  // namespace ios
-
-#endif  // IOS_PUBLIC_CONSUMER_BASE_UTIL_H_

skia/ext/skia_utils_ios_unittest.mm

@@ -8,7 +8,6 @@
 #import <UIKit/UIKit.h>
 
 #include "base/base64.h"
-#include "base/ios/ios_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {