Use GN buildflags and features to configure account consistency

components/signin/core/browser/BUILD.gn

Index: components/signin/core/browser/BUILD.gn
diff --git a/components/signin/core/browser/BUILD.gn b/components/signin/core/browser/BUILD.gn
index 8120e2a3eaef831cf687f52d08a062791678bccb..ec35efad75219a390a69fd76878dbec4c8c889d5 100644
--- a/components/signin/core/browser/BUILD.gn
+++ b/components/signin/core/browser/BUILD.gn
@@ -2,6 +2,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//components/signin/features.gni")
+
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
@@ -89,26 +91,28 @@ static_library("browser") {
 
   public_deps = [
     ":account_info",
+    "//base",

[msarda, 2017/06/20 08:51:56]

Why is this change to the public_deps necessary?

[droger, 2017/06/20 09:04:23]

It is not necessary. It's a unrelated cleanup.
I can remove it or do it as a separate CL if you prefer.

[msarda, 2017/06/20 09:10:07]

It is fine to keep it in the same CL.

It is not clear to me why we need this to be in the public deps and not in deps.
Does the sign-in code need them to be in the public deps because it uses them in
the header files?

+    "//components/content_settings/core/browser",
+    "//components/content_settings/core/common",
+    "//components/invalidation/public",
+    "//components/keyed_service/core",
+    "//components/prefs",
     "//components/signin/core/account_id",
     "//components/signin/core/common",
+    "//components/signin/core/common:signin_features",
+    "//google_apis",
+    "//net",
+    "//url",
   ]
   deps = [
-    "//base",
     "//base:i18n",
-    "//components/content_settings/core/browser",
-    "//components/content_settings/core/common",
     "//components/data_use_measurement/core",
     "//components/google/core/browser",
-    "//components/invalidation/public",
-    "//components/keyed_service/core",
     "//components/metrics",
     "//components/os_crypt",
     "//components/pref_registry",
-    "//components/prefs",
     "//components/webdata/common",
     "//crypto",
-    "//google_apis",
-    "//net",
     "//sql",
     "//third_party/icu",
   ]
@@ -121,7 +125,7 @@ static_library("browser") {
     ]
   }
 
-  if (is_android || is_ios) {
+  if (!enable_dice_support) {
     sources -= [
       "dice_header_helper.cc",
       "dice_header_helper.h",
@@ -188,6 +192,7 @@ source_set("unit_tests") {
     "//components/os_crypt:test_support",
     "//components/pref_registry:pref_registry",
     "//components/signin/core/common",
+    "//components/signin/core/common:signin_features",
     "//components/sync_preferences:test_support",
     "//testing/gmock",
   ]