Eliminate ui/ios

Per the explanation in the bug, ui/ios should not have been created in
the first place; this code belongs in the ui/gfx subcomponent.

BUG=446643

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

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

build/all.gyp

@@ -66,7 +66,6 @@
             '../third_party/mojo/mojo_public.gyp:mojo_public_test_utils',
             '../third_party/mojo/mojo_public.gyp:mojo_system',
             '../ui/base/ui_base_tests.gyp:ui_base_unittests',
-            '../ui/ios/ui_ios_tests.gyp:ui_ios_unittests',
             '../ui/gfx/gfx_tests.gyp:gfx_unittests',
           ],
         }],

ios/build/bots/chromium.fyi/Chromium_iOS_Simulator_(dbg).json

@@ -64,11 +64,6 @@
       "device type": "iPhone 5",
       "os": "8.1"
     },
-    {
-      "app": "ui_ios_unittests",
-      "device type": "iPhone 5",
-      "os": "8.1"
-    },
     {
       "app": "sync_unit_tests",
       "device type": "iPhone 5",

ios/build/bots/chromium.mac/iOS_Simulator_(dbg).json

@@ -64,11 +64,6 @@
       "device type": "iPhone Retina (4-inch)",
       "os": "7.1"
     },
-    {
-      "app": "ui_ios_unittests",
-      "device type": "iPhone Retina (4-inch)",
-      "os": "7.1"
-    },
     {
       "app": "sync_unit_tests",
       "device type": "iPhone Retina (4-inch)",

ios/build/bots/tryserver.chromium.mac/ios_dbg_simulator_ninja.json

@@ -64,11 +64,6 @@
       "device type": "iPhone Retina (4-inch)",
       "os": "7.1"
     },
-    {
-      "app": "ui_ios_unittests",
-      "device type": "iPhone Retina (4-inch)",
-      "os": "7.1"
-    },
     {
       "app": "sync_unit_tests",
       "device type": "iPhone Retina (4-inch)",

ios/chrome/browser/ui/ui_util.mm

@@ -8,7 +8,7 @@
 
 #include "base/ios/ios_util.h"
 #import "ios/chrome/browser/ui/uikit_ui_util.h"
-#include "ui/ios/uikit_util.h"
+#include "ui/gfx/ios/uikit_util.h"
 
 bool IsIPadIdiom() {
   UIUserInterfaceIdiom idiom = [[UIDevice currentDevice] userInterfaceIdiom];

ios/chrome/browser/ui/uikit_ui_util.mm

@@ -17,8 +17,8 @@
 #include "ios/chrome/browser/ui/ui_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
+#include "ui/gfx/ios/uikit_util.h"
 #include "ui/gfx/scoped_cg_context_save_gstate_mac.h"
-#include "ui/ios/uikit_util.h"
 
 namespace {
 

ui/gfx/gfx.gyp

@@ -212,6 +212,10 @@
         'image/image_util_ios.mm',
         'interpolated_transform.cc',
         'interpolated_transform.h',
+        'ios/NSString+CrStringDrawing.h',
+        'ios/NSString+CrStringDrawing.mm',
+        'ios/uikit_util.h',
+        'ios/uikit_util.mm',
         'linux_font_delegate.cc',
         'linux_font_delegate.h',
         'mac/coordinate_conversion.h',
@@ -313,12 +317,13 @@
       ],
       'conditions': [
         ['OS=="ios"', {
-          'dependencies': [
-            '<(DEPTH)/ui/ios/ui_ios.gyp:ui_ios',
-          ],
-          # iOS only uses a subset of UI.
-          'sources/': [
-            ['exclude', '^codec/jpeg_codec\\.cc$'],
+          # Linkable dependents need to set the linker flag '-ObjC' in order to
+          # use the categories in this target (e.g. NSString+CrStringDrawing.h).
+          'link_settings': {
+            'xcode_settings': {'OTHER_LDFLAGS': ['-ObjC']},
+          },
+          'sources!': [
+            'codec/jpeg_codec.cc',
           ],
         }, {
           'dependencies': [

ui/gfx/gfx_tests.gyp

@@ -18,6 +18,8 @@
         'image/image_ios_unittest.mm',
         'image/image_skia_unittest.cc',
         'image/image_unittest.cc',
+        'ios/NSString+CrStringDrawing_unittest.mm',
+        'ios/uikit_util_unittest.mm',
         'screen_unittest.cc',
         'test/run_all_unittests.cc',
         'text_elider_unittest.cc',

ui/ios/NSString+CrStringDrawing.h → ui/gfx/ios/NSString+CrStringDrawing.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_IOS_NSSTRING_CR_STRING_DRAWING_H_
-#define UI_IOS_NSSTRING_CR_STRING_DRAWING_H_
+#ifndef UI_GFX_IOS_NSSTRING_CR_STRING_DRAWING_H_
+#define UI_GFX_IOS_NSSTRING_CR_STRING_DRAWING_H_
 
 #import <UIKit/UIKit.h>
 
@@ -52,4 +52,4 @@
 
 @end
 
-#endif  // UI_IOS_NSSTRING_CR_STRING_DRAWING_H_
+#endif  // UI_GFX_IOS_NSSTRING_CR_STRING_DRAWING_H_

ui/ios/NSString+CrStringDrawing.mm → ui/gfx/ios/NSString+CrStringDrawing.mm

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#import "ui/ios/NSString+CrStringDrawing.h"
+#import "ui/gfx/ios/NSString+CrStringDrawing.h"
 
 #include "base/logging.h"
-#include "ui/ios/uikit_util.h"
+#include "ui/gfx/ios/uikit_util.h"
 
 @implementation NSString (CrStringDrawing)
 

ui/ios/NSString+CrStringDrawing_unittest.mm → ui/gfx/ios/NSString+CrStringDrawing_unittest.mm

 // Copyright 2014 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 "ui/ios/NSString+CrStringDrawing.h"
+#import "ui/gfx/ios/NSString+CrStringDrawing.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/stringprintf.h"

ui/ios/uikit_util.h → ui/gfx/ios/uikit_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_IOS_UIKIT_UTIL_H_
-#define UI_IOS_UIKIT_UTIL_H_
+#ifndef UI_GFX_IOS_UIKIT_UTIL_H_
+#define UI_GFX_IOS_UIKIT_UTIL_H_
 
 #import <UIKit/UIKit.h>
 
@@ -23,4 +23,4 @@ CGSize AlignSizeToUpperPixel(CGSize size) WARN_UNUSED_RESULT;
 
 } // namespace ui
 
-#endif  // UI_IOS_UIKIT_UTIL_H_
+#endif  // UI_GFX_IOS_UIKIT_UTIL_H_

ui/ios/uikit_util.mm → ui/gfx/ios/uikit_util.mm

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "ui/ios/uikit_util.h"
+#include "ui/gfx/ios/uikit_util.h"
 
 #import <UIKit/UIKit.h>
 

ui/ios/uikit_util_unittest.mm → ui/gfx/ios/uikit_util_unittest.mm

@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "testing/platform_test.h"
-#import "ui/ios/uikit_util.h"
+#import "ui/gfx/ios/uikit_util.h"
 
 namespace {
 

ui/gfx/platform_font_ios.mm

@@ -13,7 +13,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/font_render_params.h"
-#include "ui/ios/NSString+CrStringDrawing.h"
+#include "ui/gfx/ios/NSString+CrStringDrawing.h"
 
 namespace gfx {
 

ui/gfx/text_utils_ios.mm

@@ -10,7 +10,7 @@
 
 #include "base/strings/sys_string_conversions.h"
 #include "ui/gfx/font_list.h"
-#include "ui/ios/NSString+CrStringDrawing.h"
+#include "ui/gfx/ios/NSString+CrStringDrawing.h"
 
 namespace gfx {
 

ui/ios/ui_ios.gyp

-# Copyright 2014 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': 'ui_ios',
-      'type': 'static_library',
-      # Linkable dependents need to set the linker flag '-ObjC' in order to use
-      # the categories in this target (e.g. NSString+CrStringDrawing.h).
-      'link_settings': {
-        'xcode_settings': {'OTHER_LDFLAGS': ['-ObjC']},
-      },
-      'include_dirs': [
-        '../..',
-      ],
-      'sources': [
-        'NSString+CrStringDrawing.h',
-        'NSString+CrStringDrawing.mm',
-        'uikit_util.h',
-        'uikit_util.mm',
-      ],
-    },
-  ],
-}

ui/ios/ui_ios_tests.gyp

-# Copyright 2014 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': 'ui_ios_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:run_all_unittests',
-        '../../base/base.gyp:test_support_base',
-        '../../testing/gtest.gyp:gtest',
-        'ui_ios.gyp:ui_ios',
-      ],
-      'sources' : [
-        'NSString+CrStringDrawing_unittest.mm',
-        'uikit_util_unittest.mm',
-      ],
-    },
-  ],
-}
\ No newline at end of file