[ios] Excluded harfbuzz-ng and events code

ui/base/BUILD.gn

Index: ui/base/BUILD.gn
diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn
index add2617875daf4437f6152fc6540806c3f9345e2..6ad511f09c47ecd2385ffcd5f3f9bd874661030d 100644
--- a/ui/base/BUILD.gn
+++ b/ui/base/BUILD.gn
@@ -176,8 +176,6 @@ component("base") {
     "hit_test.h",
     "l10n/formatter.cc",
     "l10n/formatter.h",
-    "l10n/l10n_font_util.cc",
-    "l10n/l10n_font_util.h",
     "l10n/l10n_util.cc",
     "l10n/l10n_util.h",
     "l10n/l10n_util_android.cc",
@@ -193,32 +191,10 @@ component("base") {
     "layout.cc",
     "layout.h",
     "layout_mac.mm",
-    "material_design/material_design_controller.cc",
-    "material_design/material_design_controller.h",
-    "models/button_menu_item_model.cc",
-    "models/button_menu_item_model.h",
-    "models/combobox_model.cc",
-    "models/combobox_model.h",
-    "models/combobox_model_observer.h",
-    "models/dialog_model.cc",
-    "models/dialog_model.h",
     "models/list_model.h",
     "models/list_model_observer.h",
-    "models/list_selection_model.cc",
-    "models/list_selection_model.h",
-    "models/menu_model.cc",
-    "models/menu_model.h",
     "models/menu_model_delegate.h",
     "models/menu_separator_types.h",
-    "models/simple_combobox_model.cc",
-    "models/simple_combobox_model.h",
-    "models/simple_menu_model.cc",
-    "models/simple_menu_model.h",
-    "models/table_model.cc",
-    "models/table_model.h",
-    "models/table_model_observer.h",
-    "models/tree_model.cc",
-    "models/tree_model.h",
     "models/tree_node_iterator.h",
     "models/tree_node_model.h",
     "nine_image_painter_factory.cc",
@@ -237,23 +213,11 @@ component("base") {
     "resource/resource_data_dll_win.h",
     "template_expressions.cc",
     "template_expressions.h",
-    "theme_provider.cc",
-    "theme_provider.h",
     "touch/touch_device.h",
-    "touch/touch_editing_controller.cc",
-    "touch/touch_editing_controller.h",
-    "ui_base_export.h",
-    "ui_base_exports.cc",
     "ui_base_paths.cc",
     "ui_base_paths.h",
     "ui_base_switches.cc",
     "ui_base_switches.h",
-    "ui_base_switches_util.cc",
-    "ui_base_switches_util.h",
-    "ui_base_types.cc",
-    "ui_base_types.h",
-    "user_activity/user_activity_detector.cc",
-    "user_activity/user_activity_detector.h",
     "user_activity/user_activity_observer.h",
     "view_prop.cc",
     "view_prop.h",
@@ -339,8 +303,44 @@ component("base") {
       "idle/idle_linux.cc",
       "idle/idle_mac.mm",
       "idle/idle_win.cc",
+      "l10n/l10n_font_util.cc",
+      "l10n/l10n_font_util.h",
+      "material_design/material_design_controller.cc",
+      "material_design/material_design_controller.h",
+      "models/button_menu_item_model.cc",
+      "models/button_menu_item_model.h",
+      "models/combobox_model.cc",
+      "models/combobox_model.h",
+      "models/combobox_model_observer.h",
+      "models/dialog_model.cc",
+      "models/dialog_model.h",
+      "models/list_selection_model.cc",
+      "models/list_selection_model.h",
+      "models/menu_model.cc",
+      "models/menu_model.h",
+      "models/simple_combobox_model.cc",
+      "models/simple_combobox_model.h",
+      "models/simple_menu_model.cc",
+      "models/simple_menu_model.h",
+      "models/table_model.cc",
+      "models/table_model.h",
+      "models/table_model_observer.h",
+      "models/tree_model.cc",
+      "models/tree_model.h",
       "text/bytes_formatting.cc",
       "text/bytes_formatting.h",
+      "theme_provider.cc",
+      "theme_provider.h",
+      "touch/touch_editing_controller.cc",
+      "touch/touch_editing_controller.h",
+      "ui_base_export.h",
+      "ui_base_exports.cc",
+      "ui_base_switches_util.cc",
+      "ui_base_switches_util.h",
+      "ui_base_types.cc",
+      "ui_base_types.h",
+      "user_activity/user_activity_detector.cc",
+      "user_activity/user_activity_detector.h",
     ]
   }
 
@@ -393,6 +393,10 @@ component("base") {
       "l10n/l10n_util_mac.h",
       "l10n/l10n_util_mac.mm",
     ]
+    public_deps -= [ "//ui/events:events_base" ]
+    public_deps += [ "//ui/events:event_constants" ]
+    deps -= [ "//ui/events" ]

[Nico, 2016/12/09 12:20:16]

Rather than adding this unconditionally and the remove it conditionally, only
add it when needed in the first place (also elsewhere)

+
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
@@ -733,7 +737,6 @@ test("ui_base_unittests") {
     "l10n/l10n_util_win_unittest.cc",
     "l10n/time_format_unittest.cc",
     "layout_unittest.cc",
-    "material_design/material_design_controller_unittest.cc",
     "models/tree_node_iterator_unittest.cc",
     "resource/data_pack_literal.cc",
     "resource/data_pack_unittest.cc",
@@ -742,12 +745,13 @@ test("ui_base_unittests") {
     "template_expressions_unittest.cc",
     "test/page_transition_types_unittest.cc",
     "test/run_all_unittests.cc",
-    "user_activity/user_activity_detector_unittest.cc",
   ]
   if (!is_ios) {
     sources += [
+      "material_design/material_design_controller_unittest.cc",
       "test/scoped_fake_nswindow_fullscreen_unittest.mm",
       "test/test_clipboard_unittest.cc",
+      "user_activity/user_activity_detector_unittest.cc",
     ]
   }