Miscellaneous GN updates.

chrome/utility/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/crypto.gni")
 import("//build/config/features.gni")
 
 gypi_values = exec_script(
     "//build/gypi_to_gn.py",
     [ rebase_path("../chrome_utility.gypi") ],
     "scope",
     [ "../chrome_utility.gypi" ])
 
 static_library("utility") {
   sources = rebase_path(gypi_values.chrome_utility_sources, ".", "..")
   defines = []
 
   deps = [
     "//base",
-    #"../components/components_strings.gyp:components_strings",  TODO(GYP)
-    #"../components/components.gyp:url_fixer",  TODO(GYP)
+    "//components/strings",
+    "//components/url_fixer",
     "//content/public/common",
     "//content/public/utility",
-    #"../media/media.gyp:media",  TODO(GYP)
+    "//media",
     "//skia",
     "//third_party/libxml",
     "//chrome:resources",
     "//chrome:strings",
     "//chrome/common",
   ]
 
   if (!is_android) {
     sources += rebase_path(gypi_values.chrome_utility_importer_sources,
                            ".", "..")
@@ skipping 10 matching lines @@
     ]
 
     sources += rebase_path(gypi_values.chrome_utility_extensions_sources,
                            ".", "..")
     sources += rebase_path(gypi_values.chrome_utility_shared_media_sources,
                            ".", "..")
 
     if (is_win || is_mac) {
       sources += rebase_path(
           gypi_values.chrome_utility_win_mac_media_gallery_sources, ".", "..")
-      #deps += [ "//components/wifi" ]  TODO(GYP)
+      deps += [ "//components/wifi" ]
     } else {
       sources += [ "image_writer/image_writer_stub.cc" ]
     }
 
     if (is_mac) {
       sources += rebase_path(gypi_values.chrome_utility_mac_media_gallery_sources,
                              ".", "..")
     }
   }
 
@@ skipping 22 matching lines @@
     sources -= [
       "local_discovery/service_discovery_message_handler.cc",
       "local_discovery/service_discovery_message_handler.h",
     ]
   }
 
   if (safe_browsing_mode == 1) {
     defines += [ "FULL_SAFE_BROWSING" ]
   }
 }