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}
marcosholgado · Feb 19, 2015 · cdc0312 · cdc0312
1 parent cbcdfd8
commit cdc0312
Show file tree

Hide file tree

Showing 14 changed files with 0 additions and 71 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/ios/consumer/README.txt b/ios/consumer/README.txt
diff --git a/ios/consumer/base/util.mm b/ios/consumer/base/util.mm
diff --git 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
diff --git 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
diff --git a/ios/public/consumer/base/util.h b/ios/public/consumer/base/util.h
diff --git 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 {