Pull buildtools to get GN 295140

ui/base/BUILD.gn

 # 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("//build/config/ui.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
 }
@@ skipping 741 matching lines @@
       "text/bytes_formatting_unittest.cc",
       "view_prop_unittest.cc",
       "webui/web_ui_util_unittest.cc",
       "x/selection_requestor_unittest.cc",
     ]
 
     if (!use_x11) {
       if (is_chromeos) {
         # These were already removed in the chromeos case.
         sources -= [
           "ime/chromeos/character_composer_unittest.cc",

[ckocagil, 2014/09/17 15:03:27]

Looks like these are being removed before they are added. Perhaps these should
be moved to a conditional += statement in the build_ime block below.

[tfarina, 2014/09/17 15:56:00]

I will look into this.

           "ime/input_method_chromeos_unittest.cc",
         ]
       }
-      sources -= [ "ime/composition_text_util_pango_unittest.cc" ]
     }
   }
 
   if (build_ime) {
     sources += [
       "ime/candidate_window_unittest.cc",
       "ime/chromeos/character_composer_unittest.cc",
-      "ime/composition_text_util_pango_unittest.cc",
       "ime/input_method_base_unittest.cc",
       "ime/input_method_chromeos_unittest.cc",
       "ime/remote_input_method_win_unittest.cc",
       "ime/win/imm32_manager_unittest.cc",
       "ime/win/tsf_input_scope_unittest.cc",
     ]
+    if (use_x11) {
+      sources += [ "ime/composition_text_util_pango_unittest.cc" ]
+    }
   }
 
   deps = [
     "//base",
     "//base/allocator",
     "//base/test:test_support",
     "//net",
     "//skia",
     "//testing/gmock",
     "//testing/gtest",
@@ skipping 101 matching lines @@
     deps += [
       "//ui/aura:test_support",
       "//ui/events:gesture_detection",
       #'../chromeos/chromeos.gyp:chromeos',  TODO(GYP)
       #'chromeos/ui_chromeos.gyp:ui_chromeos',
     ]
   }
 }
 }
 # TODO(GYP) Mac (ui_unittest_bundle) and Android (ui_unittests_apk).