Revert of components: Fix a couple of the TODO(GYP) todos. (https://codereview.chromium.org/420113003/)

Reason for revert:
Likely caused build falure:

FAILED: ninja -t msvc -e environment.x86 -- C:\b\build\goma/gomacc "C:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\components\invalidation\invalidation_test_support.invalidator_test_template.obj.rsp /c ..\..\components\invalidation\invalidator_test_template.cc /Foobj\components\invalidation\invalidation_test_support.invalidator_test_template.obj /Fdobj\components\invalidation_test_support.cc.pdb 
c:\b\build\slave\win\build\src\components\invalidation\invalidator_test_template.h(87) : fatalerror C1083: Cannot open include file: 'google/cacheinvalidation/types.pb.h': No such file or directory
ninja: build stopped: subcommand failed.

http://build.chromium.org/p/chromium/builders/Win/builds/22963/steps/compile/logs/stdio



Original issue's description:
> components: Fix a couple of the TODO(GYP) todos.
> 
> BUG=None
> TEST=gn gen out/Debug_gn + build the effected targets with ninja.
> R=brettw@chromium.org
> TBR=jochen@chromium.org
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=286362

TBR=brettw@chromium.org,tfarina@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286467 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 10 insertions, 9 deletions

diff --git a/components/autofill/content/browser/BUILD.gn b/components/autofill/content/browser/BUILD.gn
index e68a525..dce931d 100644
--- a/components/autofill/content/browser/BUILD.gn
+++ b/components/autofill/content/browser/BUILD.gn
@@ -48,7 +48,6 @@ static_library("browser") {
     "//components/os_crypt",
     "//components/resources",
     "//components/strings",
-    "//components/user_prefs",
     "//components/webdata/common",
     "//content/public/browser",
     "//content/public/common",
@@ -63,6 +62,7 @@ static_library("browser") {
     "//ui/gfx/geometry",
     "//url",
     #"../third_party/libjingle/libjingle.gyp:libjingle",  TODO(GYP)
+    #"user_prefs",  TODO(GYP)
   ]
 
   forward_dependent_configs_from = [
diff --git a/components/autofill/core/browser/BUILD.gn b/components/autofill/core/browser/BUILD.gn
index 9f3713c..6304488 100644
--- a/components/autofill/core/browser/BUILD.gn
+++ b/components/autofill/core/browser/BUILD.gn
@@ -138,14 +138,12 @@ static_library("browser") {
     "//components/autofill/core/common",
     "//components/keyed_service/core",
     "//components/os_crypt",
-    "//components/pref_registry",
     "//components/resources",
     "//components/strings",
     "//components/webdata/common",
     "//google_apis",
     "//skia",
     "//sql",
-    "//third_party/fips181",
     "//third_party/icu",
     "//third_party/libaddressinput:util",
     "//third_party/libphonenumber",
@@ -153,8 +151,10 @@ static_library("browser") {
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//url",
+    #'../third_party/fips181/fips181.gyp:fips181',  TODO(GYP)
     # TODO(GYP) also remove libjingle_stub_config below when this is added:
     #'../third_party/libjingle/libjingle.gyp:libjingle',  TODO(GYP)
+    #'pref_registry',  TODO(GYP)
   ]
 
   configs += [ "//content:libjingle_stub_config" ]
diff --git a/components/invalidation/BUILD.gn b/components/invalidation/BUILD.gn
index 078ad64..fd6773a 100644
--- a/components/invalidation/BUILD.gn
+++ b/components/invalidation/BUILD.gn
@@ -81,11 +81,12 @@ static_library("invalidation") {
 
   deps = [
     "//base",
-    "//components/gcm_driver",
+    #"//components/gcm_driver",  TODO(GYP)
+    "//google_apis",
     "//components/keyed_service/core",
+    "//components/signin/core/browser:browser",
     "//components/pref_registry",
-    "//components/signin/core/browser",
-    "//google_apis",
+    #"//components/signin/core/browser",  TODO(GYP)
     "//sync",
     "//third_party/cacheinvalidation",
     #'../jingle/jingle.gyp:notifier',  TODO(GYP)
@@ -123,7 +124,6 @@ static_library("test_support") {
 
   deps = [
     "//base",
-    "//components/gcm_driver:test_support",
     "//components/keyed_service/core",
     "//google_apis",
     "//net",
@@ -133,5 +133,6 @@ static_library("test_support") {
     #'../jingle/jingle.gyp:notifier',  TODO(GYP)
     #'../jingle/jingle.gyp:notifier_test_util',  TODO(GYP)
     #'../sync/sync.gyp:test_support_sync_notifier',  TODO(GYP)
+    #'gcm_driver_test_support',  TODO(GYP)
   ]
 }
diff --git a/components/policy/core/browser/BUILD.gn b/components/policy/core/browser/BUILD.gn
index 6de6120..9e19d6e 100644
--- a/components/policy/core/browser/BUILD.gn
+++ b/components/policy/core/browser/BUILD.gn
@@ -20,13 +20,13 @@ source_set("browser") {
     "//base",
     "//base:prefs",
     "//base/third_party/dynamic_annotations",
-    "//components/bookmarks/browser",
     "//components/keyed_service/core",
     "//components/pref_registry",
     "//components/strings",
     "//components/url_matcher",
     "//net",
     "//ui/base",
+    #'bookmarks_browser',  TODO(GYP)
   ]
 
   if (enable_configuration_policy) {
diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn
index ce921e4..e8cd405 100644
--- a/components/search_engines/BUILD.gn
+++ b/components/search_engines/BUILD.gn
@@ -44,7 +44,6 @@ static_library("search_engines") {
   deps = [
     ":prepopulated_engines",
     "//base",
-    "//components/google/core/browser",
     "//components/keyed_service/core",
     "//components/metrics/proto",
     "//components/pref_registry",
@@ -59,6 +58,7 @@ static_library("search_engines") {
     "//third_party/libxml",
     "//ui/gfx",
     "//url",
+    #'google_core_browser',  TODO(GYP)
   ]
 
   if (enable_configuration_policy) {