Remove "easy" android_webview_build conditions from components.

Remove references to android_webview_build now that we no longer support
that build configuration. Fold conditions into their parents where
appropriate. This CL only handles the "easy" cases, I'll do the
nontrivial ones separately.

BUG=440793

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

Cr-Commit-Position: refs/heads/master@{#323490}

8 files changed, 228 insertions, 256 deletions

diff --git a/components/components.gyp b/components/components.gyp
index 864eef8..7f69f1c 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -22,15 +22,18 @@
     'crx_file.gypi',
     'data_reduction_proxy.gypi',
     'device_event_log.gypi',
-    'network_hints.gypi',
     'dom_distiller.gypi',
     'domain_reliability.gypi',
     'enhanced_bookmarks.gypi',
     'error_page.gypi',
+    'favicon.gypi',
     'favicon_base.gypi',
+    'gcm_driver.gypi',
     'google.gypi',
     'handoff.gypi',
+    'history.gypi',
     'infobars.gypi',
+    'invalidation.gypi',
     'json_schema.gypi',
     'keyed_service.gypi',
     'language_usage_metrics.gypi',
@@ -38,7 +41,9 @@
     'login.gypi',
     'metrics.gypi',
     'navigation_metrics.gypi',
+    'network_hints.gypi',
     'network_time.gypi',
+    'omnibox.gypi',
     'onc.gypi',
     'os_crypt.gypi',
     'ownership.gypi',
@@ -49,12 +54,15 @@
     'pref_registry.gypi',
     'query_parser.gypi',
     'rappor.gypi',
+    'renderer_context_menu.gypi',
     'search.gypi',
+    'search_engines.gypi',
     'search_provider_logos.gypi',
     'sessions.gypi',
     'signin.gypi',
     'startup_metric_utils.gypi',
     'suggestions.gypi',
+    'sync_driver.gypi',
     'translate.gypi',
     'ui_zoom.gypi',
     'update_client.gypi',
@@ -65,6 +73,7 @@
     'wallpaper.gypi',
     'web_resource.gypi',
     'webdata.gypi',
+    'webdata_services.gypi',
   ],
   'conditions': [
     ['OS != "ios"', {
@@ -125,21 +134,6 @@
         'constrained_window.gypi',
       ],
     }],
-    ['android_webview_build == 0', {
-      # Android WebView fails to build if a dependency on these targets is
-      # introduced.
-      'includes': [
-        'favicon.gypi',
-        'gcm_driver.gypi',
-        'history.gypi',
-        'omnibox.gypi',
-        'renderer_context_menu.gypi',
-        'search_engines.gypi',
-        'sync_driver.gypi',
-        'invalidation.gypi',
-        'webdata_services.gypi',
-      ],
-    }],
     ['enable_basic_printing==1 or enable_print_preview==1', {
       'includes': [
         'printing.gypi',
diff --git a/components/crash.gypi b/components/crash.gypi
index 37b4c54..6ba2402 100644
--- a/components/crash.gypi
+++ b/components/crash.gypi
@@ -78,7 +78,7 @@
             '../sandbox/sandbox.gyp:sandbox',
           ],
         }],
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and android_webview_build != 1', {
+        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_client',
           ],
@@ -291,7 +291,7 @@
         },
       ],
     }],
-    ['os_posix == 1 and OS != "mac" and OS != "ios" and android_webview_build != 1', {
+    ['os_posix == 1 and OS != "mac" and OS != "ios"', {
       'targets': [
         {
           # GN version: //components/crash/browser
diff --git a/components/crash/app/BUILD.gn b/components/crash/app/BUILD.gn
index 9dc7363..8c583bb 100644
--- a/components/crash/app/BUILD.gn
+++ b/components/crash/app/BUILD.gn
@@ -61,7 +61,7 @@ source_set("app") {
 
       #'../breakpad/breakpad.gyp:breakpad_sender',  TODO(GYP)
     ]
-  } else if (is_posix && !is_ios && (!is_android || !is_android_webview_build)) {
+  } else if (is_posix && !is_ios) {
     deps += [ "//breakpad:client" ]
   }
 }
diff --git a/components/crash/browser/BUILD.gn b/components/crash/browser/BUILD.gn
index 70d669f..05e0c05 100644
--- a/components/crash/browser/BUILD.gn
+++ b/components/crash/browser/BUILD.gn
@@ -31,7 +31,7 @@ source_set("browser") {
 
   # This is not in the GYP build but this target includes breakpad client
   # headers, so add the dependency here.
-  if (is_posix && !is_ios && (!is_android || !is_android_webview_build)) {
+  if (is_posix && !is_ios) {
     configs += [ "//breakpad:client_config" ]
     public_configs = [ "//breakpad:client_config" ]
   }
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index 6e8cf3a..4741e3c 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -3,12 +3,155 @@
 # found in the LICENSE file.
 
 {
+  'targets': [
+    {
+      # GN version: //components/dom_distiller/webui
+      'target_name': 'dom_distiller_webui',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../content/content.gyp:content_browser',
+        '../net/net.gyp:net',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../url/url.gyp:url_lib',
+        'components_resources.gyp:components_resources',
+        'components_strings.gyp:components_strings',
+        'distilled_page_proto',
+        'dom_distiller_core',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'dom_distiller/webui/dom_distiller_handler.cc',
+        'dom_distiller/webui/dom_distiller_handler.h',
+        'dom_distiller/webui/dom_distiller_ui.cc',
+        'dom_distiller/webui/dom_distiller_ui.h',
+      ],
+    },
+    {
+      # GN version: //components/dom_distiller/core
+      'target_name': 'dom_distiller_core',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_prefs',
+        '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
+        '../third_party/dom_distiller_js/dom_distiller_js.gyp:dom_distiller_js_proto',
+        'components.gyp:leveldb_proto',
+        'components_resources.gyp:components_resources',
+        'components_strings.gyp:components_strings',
+        'distilled_page_proto',
+        'pref_registry',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'export_dependent_settings': [
+        'distilled_page_proto',
+        '../third_party/dom_distiller_js/dom_distiller_js.gyp:dom_distiller_js_proto',
+      ],
+      'sources': [
+        'dom_distiller/android/component_jni_registrar.cc',
+        'dom_distiller/android/component_jni_registrar.h',
+        'dom_distiller/core/article_attachments_data.cc',
+        'dom_distiller/core/article_attachments_data.h',
+        'dom_distiller/core/article_distillation_update.cc',
+        'dom_distiller/core/article_distillation_update.h',
+        'dom_distiller/core/article_entry.cc',
+        'dom_distiller/core/article_entry.h',
+        'dom_distiller/core/distilled_content_store.cc',
+        'dom_distiller/core/distilled_content_store.h',
+        'dom_distiller/core/distilled_page_prefs.cc',
+        'dom_distiller/core/distilled_page_prefs.h',
+        'dom_distiller/core/distilled_page_prefs_android.cc',
+        'dom_distiller/core/distilled_page_prefs_android.h',
+        'dom_distiller/core/distiller.cc',
+        'dom_distiller/core/distiller.h',
+        'dom_distiller/core/distiller_page.cc',
+        'dom_distiller/core/distiller_page.h',
+        'dom_distiller/core/distiller_url_fetcher.cc',
+        'dom_distiller/core/distiller_url_fetcher.h',
+        'dom_distiller/core/dom_distiller_constants.cc',
+        'dom_distiller/core/dom_distiller_constants.h',
+        'dom_distiller/core/dom_distiller_model.cc',
+        'dom_distiller/core/dom_distiller_model.h',
+        'dom_distiller/core/dom_distiller_observer.h',
+        'dom_distiller/core/dom_distiller_service.cc',
+        'dom_distiller/core/dom_distiller_service.h',
+        'dom_distiller/core/dom_distiller_service_android.cc',
+        'dom_distiller/core/dom_distiller_service_android.h',
+        'dom_distiller/core/dom_distiller_store.cc',
+        'dom_distiller/core/dom_distiller_store.h',
+        'dom_distiller/core/feedback_reporter.cc',
+        'dom_distiller/core/feedback_reporter.h',
+        'dom_distiller/core/font_family_list.h',
+        'dom_distiller/core/task_tracker.cc',
+        'dom_distiller/core/task_tracker.h',
+        'dom_distiller/core/theme_list.h',
+        'dom_distiller/core/url_constants.cc',
+        'dom_distiller/core/url_constants.h',
+        'dom_distiller/core/url_utils.cc',
+        'dom_distiller/core/url_utils.h',
+        'dom_distiller/core/url_utils_android.cc',
+        'dom_distiller/core/url_utils_android.h',
+        'dom_distiller/core/viewer.cc',
+        'dom_distiller/core/viewer.h',
+      ],
+      'conditions': [
+        ['OS == "android"', {
+          'dependencies': [
+            'dom_distiller_core_jni_headers',
+          ],
+        }],
+      ],
+    },
+    {
+      # GN version: components/dom_distiller/core:test_support
+      'target_name': 'dom_distiller_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        'dom_distiller_core',
+        'components.gyp:leveldb_proto_test_support',
+        '../sync/sync.gyp:sync',
+        '../testing/gmock.gyp:gmock',
+        '../url/url.gyp:url_lib',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'sources': [
+        'dom_distiller/core/dom_distiller_test_util.cc',
+        'dom_distiller/core/dom_distiller_test_util.h',
+        'dom_distiller/core/fake_distiller.cc',
+        'dom_distiller/core/fake_distiller.h',
+        'dom_distiller/core/fake_distiller_page.cc',
+        'dom_distiller/core/fake_distiller_page.h',
+      ],
+    },
+    {
+      # GN version: //components/dom_distiller/core/proto
+      'target_name': 'distilled_page_proto',
+      'type': 'static_library',
+      'sources': [
+        'dom_distiller/core/proto/distilled_article.proto',
+        'dom_distiller/core/proto/distilled_page.proto',
+      ],
+      'variables': {
+        'proto_in_dir': 'dom_distiller/core/proto',
+        'proto_out_dir': 'components/dom_distiller/core/proto',
+      },
+      'includes': [ '../build/protoc.gypi' ]
+    },
+  ],
   'conditions': [
-    ['android_webview_build == 0', {
+    ['OS != "ios"', {
       'targets': [
         {
-          # GN version: //components/dom_distiller/webui
-          'target_name': 'dom_distiller_webui',
+          # GN version: //components/dom_distiller/content
+          'target_name': 'dom_distiller_content',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
@@ -16,251 +159,104 @@
             '../net/net.gyp:net',
             '../skia/skia.gyp:skia',
             '../sync/sync.gyp:sync',
+            '../ui/gfx/gfx.gyp:gfx',
             '../url/url.gyp:url_lib',
             'components_resources.gyp:components_resources',
             'components_strings.gyp:components_strings',
-            'distilled_page_proto',
             'dom_distiller_core',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
-            'dom_distiller/webui/dom_distiller_handler.cc',
-            'dom_distiller/webui/dom_distiller_handler.h',
-            'dom_distiller/webui/dom_distiller_ui.cc',
-            'dom_distiller/webui/dom_distiller_ui.h',
+            'dom_distiller/content/distiller_page_web_contents.cc',
+            'dom_distiller/content/distiller_page_web_contents.h',
+            'dom_distiller/content/dom_distiller_viewer_source.cc',
+            'dom_distiller/content/dom_distiller_viewer_source.h',
+            'dom_distiller/content/web_contents_main_frame_observer.cc',
+            'dom_distiller/content/web_contents_main_frame_observer.h',
           ],
         },
+      ],
+    }],
+    ['OS=="ios"', {
+      'targets': [
         {
-          # GN version: //components/dom_distiller/core
-          'target_name': 'dom_distiller_core',
+          'target_name': 'dom_distiller_ios',
           'type': 'static_library',
           'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_prefs',
-            '../skia/skia.gyp:skia',
-            '../sync/sync.gyp:sync',
-            '../third_party/dom_distiller_js/dom_distiller_js.gyp:dom_distiller_js_proto',
-            'components.gyp:leveldb_proto',
-            'components_resources.gyp:components_resources',
-            'components_strings.gyp:components_strings',
+            '../ios/provider/ios_provider_web.gyp:ios_provider_web',
             'distilled_page_proto',
-            'pref_registry',
+            'dom_distiller_core',
           ],
           'include_dirs': [
             '..',
           ],
-          'export_dependent_settings': [
-            'distilled_page_proto',
-            '../third_party/dom_distiller_js/dom_distiller_js.gyp:dom_distiller_js_proto',
-          ],
           'sources': [
-            'dom_distiller/android/component_jni_registrar.cc',
-            'dom_distiller/android/component_jni_registrar.h',
-            'dom_distiller/core/article_attachments_data.cc',
-            'dom_distiller/core/article_attachments_data.h',
-            'dom_distiller/core/article_distillation_update.cc',
-            'dom_distiller/core/article_distillation_update.h',
-            'dom_distiller/core/article_entry.cc',
-            'dom_distiller/core/article_entry.h',
-            'dom_distiller/core/distilled_content_store.cc',
-            'dom_distiller/core/distilled_content_store.h',
-            'dom_distiller/core/distilled_page_prefs.cc',
-            'dom_distiller/core/distilled_page_prefs.h',
-            'dom_distiller/core/distilled_page_prefs_android.cc',
-            'dom_distiller/core/distilled_page_prefs_android.h',
-            'dom_distiller/core/distiller.cc',
-            'dom_distiller/core/distiller.h',
-            'dom_distiller/core/distiller_page.cc',
-            'dom_distiller/core/distiller_page.h',
-            'dom_distiller/core/distiller_url_fetcher.cc',
-            'dom_distiller/core/distiller_url_fetcher.h',
-            'dom_distiller/core/dom_distiller_constants.cc',
-            'dom_distiller/core/dom_distiller_constants.h',
-            'dom_distiller/core/dom_distiller_model.cc',
-            'dom_distiller/core/dom_distiller_model.h',
-            'dom_distiller/core/dom_distiller_observer.h',
-            'dom_distiller/core/dom_distiller_service.cc',
-            'dom_distiller/core/dom_distiller_service.h',
-            'dom_distiller/core/dom_distiller_service_android.cc',
-            'dom_distiller/core/dom_distiller_service_android.h',
-            'dom_distiller/core/dom_distiller_store.cc',
-            'dom_distiller/core/dom_distiller_store.h',
-            'dom_distiller/core/feedback_reporter.cc',
-            'dom_distiller/core/feedback_reporter.h',
-            'dom_distiller/core/font_family_list.h',
-            'dom_distiller/core/task_tracker.cc',
-            'dom_distiller/core/task_tracker.h',
-            'dom_distiller/core/theme_list.h',
-            'dom_distiller/core/url_constants.cc',
-            'dom_distiller/core/url_constants.h',
-            'dom_distiller/core/url_utils.cc',
-            'dom_distiller/core/url_utils.h',
-            'dom_distiller/core/url_utils_android.cc',
-            'dom_distiller/core/url_utils_android.h',
-            'dom_distiller/core/viewer.cc',
-            'dom_distiller/core/viewer.h',
-          ],
-          'conditions': [
-            ['OS == "android"', {
-              'dependencies': [
-                'dom_distiller_core_jni_headers',
-              ],
-            }],
+            'dom_distiller/ios/distiller_page_factory_ios.h',
+            'dom_distiller/ios/distiller_page_factory_ios.mm',
+            'dom_distiller/ios/distiller_page_ios.h',
+            'dom_distiller/ios/distiller_page_ios.mm',
           ],
         },
+      ],
+    }],
+    ['OS=="android"', {
+      'targets': [
         {
-          # GN version: components/dom_distiller/core:test_support
-          'target_name': 'dom_distiller_test_support',
-          'type': 'static_library',
+          # GN: //components/dom_distiller/android:dom_distiller_core_java
+          'target_name': 'dom_distiller_core_java',
+          'type': 'none',
           'dependencies': [
-            'dom_distiller_core',
-            'components.gyp:leveldb_proto_test_support',
-            '../sync/sync.gyp:sync',
-            '../testing/gmock.gyp:gmock',
-            '../url/url.gyp:url_lib',
-          ],
-          'include_dirs': [
-            '..',
+            'dom_distiller_core_font_family_java',
+            'dom_distiller_core_theme_java',
+            '../base/base.gyp:base',
           ],
+          'variables': {
+            'java_in_dir': 'dom_distiller/android/java',
+          },
+          'includes': [ '../build/java.gypi' ],
+        },
+        {
+          # GN: //components/dom_distiller/android:dom_distiller_core_font_family_javagen
+          'target_name': 'dom_distiller_core_font_family_java',
+          'type': 'none',
           'sources': [
-            'dom_distiller/core/dom_distiller_test_util.cc',
-            'dom_distiller/core/dom_distiller_test_util.h',
-            'dom_distiller/core/fake_distiller.cc',
-            'dom_distiller/core/fake_distiller.h',
-            'dom_distiller/core/fake_distiller_page.cc',
-            'dom_distiller/core/fake_distiller_page.h',
+            'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/FontFamily.template',
           ],
+          'variables': {
+            'package_name': 'org/chromium/components/dom_distiller/core',
+            'template_deps': ['dom_distiller/core/font_family_list.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
         {
-          # GN version: //components/dom_distiller/core/proto
-          'target_name': 'distilled_page_proto',
-          'type': 'static_library',
+          # GN: //components/dom_distiller/core:jni_headers
+          'target_name': 'dom_distiller_core_jni_headers',
+          'type': 'none',
           'sources': [
-            'dom_distiller/core/proto/distilled_article.proto',
-            'dom_distiller/core/proto/distilled_page.proto',
+            'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java',
+            'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java',
+            'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java',
           ],
           'variables': {
-            'proto_in_dir': 'dom_distiller/core/proto',
-            'proto_out_dir': 'components/dom_distiller/core/proto',
+            'jni_gen_package': 'dom_distiller_core',
           },
-          'includes': [ '../build/protoc.gypi' ]
+          'includes': [ '../build/jni_generator.gypi' ],
         },
-      ],
-      'conditions': [
-        ['OS != "ios"', {
-          'targets': [
-            {
-              # GN version: //components/dom_distiller/content
-              'target_name': 'dom_distiller_content',
-              'type': 'static_library',
-              'dependencies': [
-                '../base/base.gyp:base',
-                '../content/content.gyp:content_browser',
-                '../net/net.gyp:net',
-                '../skia/skia.gyp:skia',
-                '../sync/sync.gyp:sync',
-                '../ui/gfx/gfx.gyp:gfx',
-                '../url/url.gyp:url_lib',
-                'components_resources.gyp:components_resources',
-                'components_strings.gyp:components_strings',
-                'dom_distiller_core',
-              ],
-              'include_dirs': [
-                '..',
-              ],
-              'sources': [
-                'dom_distiller/content/distiller_page_web_contents.cc',
-                'dom_distiller/content/distiller_page_web_contents.h',
-                'dom_distiller/content/dom_distiller_viewer_source.cc',
-                'dom_distiller/content/dom_distiller_viewer_source.h',
-                'dom_distiller/content/web_contents_main_frame_observer.cc',
-                'dom_distiller/content/web_contents_main_frame_observer.h',
-              ],
-            },
-          ],
-        }],
-        ['OS=="ios"', {
-          'targets': [
-            {
-              'target_name': 'dom_distiller_ios',
-              'type': 'static_library',
-              'dependencies': [
-                '../ios/provider/ios_provider_web.gyp:ios_provider_web',
-                'distilled_page_proto',
-                'dom_distiller_core',
-              ],
-              'include_dirs': [
-                '..',
-              ],
-              'sources': [
-                'dom_distiller/ios/distiller_page_factory_ios.h',
-                'dom_distiller/ios/distiller_page_factory_ios.mm',
-                'dom_distiller/ios/distiller_page_ios.h',
-                'dom_distiller/ios/distiller_page_ios.mm',
-              ],
-            },
-          ],
-        }],
-        ['OS=="android"', {
-          'targets': [
-            {
-              # GN: //components/dom_distiller/android:dom_distiller_core_java
-              'target_name': 'dom_distiller_core_java',
-              'type': 'none',
-              'dependencies': [
-                'dom_distiller_core_font_family_java',
-                'dom_distiller_core_theme_java',
-                '../base/base.gyp:base',
-              ],
-              'variables': {
-                'java_in_dir': 'dom_distiller/android/java',
-              },
-              'includes': [ '../build/java.gypi' ],
-            },
-            {
-              # GN: //components/dom_distiller/android:dom_distiller_core_font_family_javagen
-              'target_name': 'dom_distiller_core_font_family_java',
-              'type': 'none',
-              'sources': [
-                'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/FontFamily.template',
-              ],
-              'variables': {
-                'package_name': 'org/chromium/components/dom_distiller/core',
-                'template_deps': ['dom_distiller/core/font_family_list.h'],
-              },
-              'includes': [ '../build/android/java_cpp_template.gypi' ],
-            },
-            {
-              # GN: //components/dom_distiller/core:jni_headers
-              'target_name': 'dom_distiller_core_jni_headers',
-              'type': 'none',
-              'sources': [
-                'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DistilledPagePrefs.java',
-                'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerService.java',
-                'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/DomDistillerUrlUtils.java',
-              ],
-              'variables': {
-                'jni_gen_package': 'dom_distiller_core',
-              },
-              'includes': [ '../build/jni_generator.gypi' ],
-            },
-            {
-              # GN: //components/dom_distiller/android:dom_distiller_core_theme_javagen
-              'target_name': 'dom_distiller_core_theme_java',
-              'type': 'none',
-              'sources': [
-                'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/Theme.template',
-              ],
-              'variables': {
-                'package_name': 'org/chromium/components/dom_distiller/core',
-                'template_deps': ['dom_distiller/core/theme_list.h'],
-              },
-              'includes': [ '../build/android/java_cpp_template.gypi' ],
-            },
+        {
+          # GN: //components/dom_distiller/android:dom_distiller_core_theme_javagen
+          'target_name': 'dom_distiller_core_theme_java',
+          'type': 'none',
+          'sources': [
+            'dom_distiller/android/java/src/org/chromium/components/dom_distiller/core/Theme.template',
           ],
-        }],
+          'variables': {
+            'package_name': 'org/chromium/components/dom_distiller/core',
+            'template_deps': ['dom_distiller/core/theme_list.h'],
+          },
+          'includes': [ '../build/android/java_cpp_template.gypi' ],
+        },
       ],
     }],
   ],
diff --git a/components/resources/components_resources.grd b/components/resources/components_resources.grd
index d5436fd..099086b 100644
--- a/components/resources/components_resources.grd
+++ b/components/resources/components_resources.grd
@@ -9,9 +9,7 @@
   <release seq="1">
     <includes>
       <part file="data_reduction_proxy_resources.grdp" />
-      <if expr="not is_android_webview_build">
-        <part file="dom_distiller_resources.grdp" />
-      </if>
+      <part file="dom_distiller_resources.grdp" />
       <part file="printing_resources.grdp" />
       <part file="translate_resources.grdp" />
       <part file="webui_generator_resources.grdp" />
diff --git a/components/sessions.gypi b/components/sessions.gypi
index ce930d8..25dd69a 100644
--- a/components/sessions.gypi
+++ b/components/sessions.gypi
@@ -42,6 +42,7 @@
       'defines!': ['SESSIONS_IMPLEMENTATION'],
       'dependencies': [
         '../skia/skia.gyp:skia',
+        '../sync/sync.gyp:sync',
         '../testing/gtest.gyp:gtest',
       ],
       'include_dirs': [
@@ -53,11 +54,6 @@
         'sessions/serialized_navigation_entry_test_helper.h',
       ],
       'conditions': [
-        ['android_webview_build == 0', {
-          'dependencies': [
-             '../sync/sync.gyp:sync',
-          ]
-        }],
         ['OS!="ios" and OS!="android"', {
          'sources': [
            'sessions/base_session_service_test_helper.cc',
@@ -83,6 +79,7 @@
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../content/content.gyp:content_browser',
             '../skia/skia.gyp:skia',
+            '../sync/sync.gyp:sync',
             '../third_party/protobuf/protobuf.gyp:protobuf_lite',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx_geometry',
@@ -103,13 +100,6 @@
             'sessions/content/content_serialized_navigation_driver.cc',
             'sessions/content/content_serialized_navigation_driver.h',
           ],
-          'conditions': [
-            ['android_webview_build == 0', {
-              'dependencies': [
-                 '../sync/sync.gyp:sync',
-              ]
-            }],
-          ],
         },
       ],
     }, {  # OS==ios
diff --git a/components/sessions/BUILD.gn b/components/sessions/BUILD.gn
index 4cf5709..d66b867 100644
--- a/components/sessions/BUILD.gn
+++ b/components/sessions/BUILD.gn
@@ -37,15 +37,12 @@ source_set("sessions_core") {
   deps = [
     "//base",
     "//skia",
+    "//sync",
     "//third_party/protobuf:protobuf_lite",
     "//ui/base",
     "//ui/gfx",
     "//url",
   ]
-
-  if (!is_android || !is_android_webview_build) {
-    deps += [ "//sync" ]
-  }
 }
 
 source_set("test_support") {
@@ -58,13 +55,10 @@ source_set("test_support") {
   deps = [
     ":sessions_core",
     "//skia",
+    "//sync",
     "//testing/gtest",
   ]
 
-  if (!is_android || !is_android_webview_build) {
-    deps += [ "//sync" ]
-  }
-
   if (!is_android && !is_ios) {
     sources += [
       "base_session_service_test_helper.cc",