diff options
author | sdefresne <sdefresne@chromium.org> | 2015-02-19 07:38:36 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-19 15:39:03 +0000 |
commit | cdc03121d7c798a87c4c90fd16981065ed06c5db (patch) | |
tree | e90ec56aff70c99ad8e6ad644794cac01f069741 | |
parent | cbcdfd84a59e7216d315689362ccc41626608987 (diff) | |
download | chromium_src-cdc03121d7c798a87c4c90fd16981065ed06c5db.zip chromium_src-cdc03121d7c798a87c4c90fd16981065ed06c5db.tar.gz chromium_src-cdc03121d7c798a87c4c90fd16981065ed06c5db.tar.bz2 |
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}
-rw-r--r-- | base/ios/device_util.mm | 1 | ||||
-rw-r--r-- | base/ios/device_util_unittest.mm | 1 | ||||
-rw-r--r-- | components/policy/core/common/policy_loader_ios_unittest.mm | 1 | ||||
-rw-r--r-- | ios/chrome/browser/snapshots/snapshot_cache.mm | 1 | ||||
-rw-r--r-- | ios/chrome/browser/ui/uikit_ui_util_unittest.mm | 1 | ||||
-rw-r--r-- | ios/consumer/OWNERS | 2 | ||||
-rw-r--r-- | ios/consumer/README.txt | 7 | ||||
-rw-r--r-- | ios/consumer/base/util.mm | 14 | ||||
-rw-r--r-- | ios/ios.gyp | 1 | ||||
-rw-r--r-- | ios/ios_base.gyp | 23 | ||||
-rw-r--r-- | ios/ios_tests_unit.gyp | 1 | ||||
-rw-r--r-- | ios/public/consumer/OWNERS | 2 | ||||
-rw-r--r-- | ios/public/consumer/base/util.h | 15 | ||||
-rw-r--r-- | skia/ext/skia_utils_ios_unittest.mm | 1 |
14 files changed, 0 insertions, 71 deletions
diff --git a/base/ios/device_util.mm b/base/ios/device_util.mm index ff7be36..1234562 100644 --- a/base/ios/device_util.mm +++ b/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" diff --git a/base/ios/device_util_unittest.mm b/base/ios/device_util_unittest.mm index 3494e00..82d4217 100644 --- a/base/ios/device_util_unittest.mm +++ b/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" diff --git a/components/policy/core/common/policy_loader_ios_unittest.mm b/components/policy/core/common/policy_loader_ios_unittest.mm index f77893a..f22d37f 100644 --- a/components/policy/core/common/policy_loader_ios_unittest.mm +++ b/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" diff --git a/ios/chrome/browser/snapshots/snapshot_cache.mm b/ios/chrome/browser/snapshots/snapshot_cache.mm index 5b8c9a10..420a8e1 100644 --- a/ios/chrome/browser/snapshots/snapshot_cache.mm +++ b/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 () diff --git a/ios/chrome/browser/ui/uikit_ui_util_unittest.mm b/ios/chrome/browser/ui/uikit_ui_util_unittest.mm index c640071..3c76e15 100644 --- a/ios/chrome/browser/ui/uikit_ui_util_unittest.mm +++ b/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" diff --git a/ios/consumer/OWNERS b/ios/consumer/OWNERS deleted file mode 100644 index d065c3e..0000000 --- a/ios/consumer/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -sdefresne@chromium.org -stuartmorgan@chromium.org diff --git a/ios/consumer/README.txt b/ios/consumer/README.txt deleted file mode 100644 index b6907ea..0000000 --- a/ios/consumer/README.txt +++ /dev/null @@ -1,7 +0,0 @@ -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. diff --git a/ios/consumer/base/util.mm b/ios/consumer/base/util.mm deleted file mode 100644 index 6657c6b..0000000 --- a/ios/consumer/base/util.mm +++ /dev/null @@ -1,14 +0,0 @@ -// 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 diff --git a/ios/ios.gyp b/ios/ios.gyp index cae4950..c519585 100644 --- a/ios/ios.gyp +++ b/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:*', diff --git a/ios/ios_base.gyp b/ios/ios_base.gyp deleted file mode 100644 index 79bf7b2..0000000 --- a/ios/ios_base.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# 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', - ], - }, - ], -} diff --git a/ios/ios_tests_unit.gyp b/ios/ios_tests_unit.gyp index 3d33685..817dd47 100644 --- a/ios/ios_tests_unit.gyp +++ b/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', ], diff --git a/ios/public/consumer/OWNERS b/ios/public/consumer/OWNERS deleted file mode 100644 index d065c3e..0000000 --- a/ios/public/consumer/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -sdefresne@chromium.org -stuartmorgan@chromium.org diff --git a/ios/public/consumer/base/util.h b/ios/public/consumer/base/util.h deleted file mode 100644 index a132de5..0000000 --- a/ios/public/consumer/base/util.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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_ diff --git a/skia/ext/skia_utils_ios_unittest.mm b/skia/ext/skia_utils_ios_unittest.mm index c199304..8d0c9be 100644 --- a/skia/ext/skia_utils_ios_unittest.mm +++ b/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 { |