Update skia and ui GN builds

tools/gn/secondary/testing/gtest/BUILD.gn

 # Copyright (c) 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.
 
 config("gtest_config") {
   visibility = [
     ":*",
     "//testing/gmock:*",  # gmock also shares this config.
   ]
 
@@ skipping 34 matching lines @@
       "GTEST_USE_OWN_TR1_TUPLE=1",
 
       # GTEST_USE_OWN_TR1_TUPLE only works if GTEST_HAS_TR1_TUPLE is set.
       # gtest r625 made it so that GTEST_HAS_TR1_TUPLE is set to 0
       # automatically on android, so it has to be set explicitly here.
       "GTEST_HAS_TR1_TUPLE=1",
     ]
   }
 }
 
-static_library("gtest") {
+source_set("gtest") {
   sources = [
     "include/gtest/gtest-death-test.h",
     "include/gtest/gtest-message.h",
     "include/gtest/gtest-param-test.h",
     "include/gtest/gtest-printers.h",
     "include/gtest/gtest-spi.h",
     "include/gtest/gtest-test-part.h",
     "include/gtest/gtest-typed-test.h",
     "include/gtest/gtest.h",
     "include/gtest/gtest_pred_impl.h",
@@ skipping 29 matching lines @@
     ]
   }
 
   include_dirs = [ "." ]
 
   all_dependent_configs = [ ":gtest_config" ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [ "//build/config/compiler:no_chromium_code" ]
 }