Remove android_webview_build conditions in android_webview.

Remove references to android_webview_build now that we no longer support
that build configuration. Fold conditions into their parents where
appropriate. Activate a CHECK() that was previously omitted due to
incompatibility with android_webview_build==1.

BUG=440793

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

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

4 files changed, 56 insertions, 150 deletions

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index d74ed7d..6d69eb0 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -30,32 +30,28 @@
           },
          'includes': [ '../build/repack_action.gypi' ],
         },
+        {
+          'action_name': 'android_webview_locales_rename_paks',
+          'variables': {
+            'rename_locales': 'tools/webview_locales_rename_paks.py',
+          },
+          'inputs': [
+            '<(rename_locales)',
+            '<!@pymod_do_main(webview_locales_rename_paks -i -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+          ],
+          'outputs': [
+            '<!@pymod_do_main(webview_locales_rename_paks -o -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
+          ],
+          'action': [
+            'python',
+            '<(rename_locales)',
+            '-p', '<(PRODUCT_DIR)',
+            '-s', '<(SHARED_INTERMEDIATE_DIR)',
+            '<@(locales)',
+          ],
+        },
       ],
       'conditions': [
-        ['android_webview_build==0', {
-          'actions': [
-            {
-              'action_name': 'android_webview_locales_rename_paks',
-              'variables': {
-                'rename_locales': 'tools/webview_locales_rename_paks.py',
-              },
-              'inputs': [
-                '<(rename_locales)',
-                '<!@pymod_do_main(webview_locales_rename_paks -i -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
-              ],
-              'outputs': [
-                '<!@pymod_do_main(webview_locales_rename_paks -o -p <(PRODUCT_DIR) -s <(SHARED_INTERMEDIATE_DIR) <(locales))'
-              ],
-              'action': [
-                'python',
-                '<(rename_locales)',
-                '-p', '<(PRODUCT_DIR)',
-                '-s', '<(SHARED_INTERMEDIATE_DIR)',
-                '<@(locales)',
-              ],
-            }
-          ],
-        }],
         ['v8_use_external_startup_data==1', {
           'variables': {
             'conditions': [
@@ -161,8 +157,10 @@
         '../android_webview/native/webview_native.gyp:webview_native',
         '../components/components.gyp:auto_login_parser',
         '../components/components.gyp:autofill_content_renderer',
+        '../components/components.gyp:breakpad_host',
         '../components/components.gyp:cdm_browser',
         '../components/components.gyp:cdm_renderer',
+        '../components/components.gyp:crash_component',
         '../components/components.gyp:data_reduction_proxy_core_browser',
         '../components/components.gyp:navigation_interception',
         '../components/components.gyp:printing_common',
@@ -307,6 +305,7 @@
         'common/render_view_messages.h',
         'common/url_constants.cc',
         'common/url_constants.h',
+        'crash_reporter/aw_microdump_crash_reporter.cc',
         'crash_reporter/aw_microdump_crash_reporter.h',
         'lib/aw_browser_dependency_factory_impl.cc',
         'lib/aw_browser_dependency_factory_impl.h',
@@ -334,66 +333,43 @@
         'renderer/print_render_frame_observer.cc',
         'renderer/print_render_frame_observer.h',
       ],
-      # TODO(primiano): remove the *_disabled_in_android_builds fallback and
-      # merge this with the target once android_webview_build goes away.
-      'conditions': [
-        ['android_webview_build==0', {
-          'dependencies': [
-            '../components/components.gyp:breakpad_host',
-            '../components/components.gyp:crash_component',
-          ],
-          'sources': [
-            'crash_reporter/aw_microdump_crash_reporter.cc',
-          ],
-        }, {  # android_webview_build==1
-          'sources': [
-            'crash_reporter/aw_microdump_crash_reporter_disabled_in_android_builds.cc',
-          ],
-        }],
-      ],
     },
     {
       'target_name': 'libwebviewchromium',
       'includes': [
           'libwebviewchromium.gypi',
       ],
-    }
-  ],
-  'conditions': [
-    ['android_webview_build==0', {
-      'includes': [
-        'android_webview_tests.gypi',
-      ],
-      'targets': [
-        {
-          'target_name': 'android_webview_java',
-          'type': 'none',
-          'dependencies': [
-            '../components/components.gyp:navigation_interception_java',
-            '../components/components.gyp:web_contents_delegate_android_java',
-            '../content/content.gyp:content_java',
-            '../ui/android/ui_android.gyp:ui_java',
-            'android_webview_strings_grd',
-          ],
-          'variables': {
-            'java_in_dir': '../android_webview/java',
-            'has_java_resources': 1,
-            'R_package': 'org.chromium.android_webview',
-            'R_package_relpath': 'org/chromium/android_webview',
-          },
-          'includes': [ '../build/java.gypi' ],
-        },
-        {
-          'target_name': 'system_webview_apk',
-          'variables': {
-            'apk_name': 'SystemWebView',
-            'android_sdk_jar': '../third_party/android_platform/webview/frameworks_5.1.0_r1.jar',
-            'java_in_dir': 'glue/java',
-            'resource_dir': 'apk/java/res',
-          },
-          'includes': [ 'apk/system_webview_apk_common.gypi' ],
-        },
+    },
+    {
+      'target_name': 'android_webview_java',
+      'type': 'none',
+      'dependencies': [
+        '../components/components.gyp:navigation_interception_java',
+        '../components/components.gyp:web_contents_delegate_android_java',
+        '../content/content.gyp:content_java',
+        '../ui/android/ui_android.gyp:ui_java',
+        'android_webview_strings_grd',
       ],
-    }],
+      'variables': {
+        'java_in_dir': '../android_webview/java',
+        'has_java_resources': 1,
+        'R_package': 'org.chromium.android_webview',
+        'R_package_relpath': 'org/chromium/android_webview',
+      },
+      'includes': [ '../build/java.gypi' ],
+    },
+    {
+      'target_name': 'system_webview_apk',
+      'variables': {
+        'apk_name': 'SystemWebView',
+        'android_sdk_jar': '../third_party/android_platform/webview/frameworks_5.1.0_r1.jar',
+        'java_in_dir': 'glue/java',
+        'resource_dir': 'apk/java/res',
+      },
+      'includes': [ 'apk/system_webview_apk_common.gypi' ],
+    },
+  ],
+  'includes': [
+    'android_webview_tests.gypi',
   ],
 }
diff --git a/android_webview/crash_reporter/aw_microdump_crash_reporter_disabled_in_android_builds.cc b/android_webview/crash_reporter/aw_microdump_crash_reporter_disabled_in_android_builds.cc
deleted file mode 100644
index d5c6e7b..0000000
--- a/android_webview/crash_reporter/aw_microdump_crash_reporter_disabled_in_android_builds.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 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.
-
-#include "android_webview/crash_reporter/aw_microdump_crash_reporter.h"
-
-// TODO(primiano): remove this once Android builds of WebView are deprecated.
-// This translation unit is a no-op fallback for AwCrashReporter. This is built
-// only when building in the Android tree.
-// The rationale of this hack is to avoid the cost of maintaining breakpad in
-// the Android tree, as the WebView build in Android itself is going to be
-// deprecated soon (crbug.com/440792).
-
-namespace android_webview {
-namespace crash_reporter {
-
-void EnableMicrodumpCrashReporter() {
-}
-
-}  // namespace crash_reporter
-}  // namespace android_webview
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 127baa7..1377618 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -115,10 +115,8 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
   CHECK(AwAssets::RegisterAssetWithGlobalDescriptors(
       kV8SnapshotDataDescriptor, kSnapshotFileName));
 #endif
-  // TODO(mkosiba): make this CHECK when the android_webview_build uses an asset
-  // from the .apk too.
-  AwAssets::RegisterAssetWithGlobalDescriptors(
-      kAndroidICUDataDescriptor, base::i18n::kIcuDataFileName);
+  CHECK(AwAssets::RegisterAssetWithGlobalDescriptors(
+      kAndroidICUDataDescriptor, base::i18n::kIcuDataFileName));
 
   return false;
 }
diff --git a/android_webview/libwebviewchromium.gypi b/android_webview/libwebviewchromium.gypi
index 32b1c95..d266cbb 100644
--- a/android_webview/libwebviewchromium.gypi
+++ b/android_webview/libwebviewchromium.gypi
@@ -10,53 +10,6 @@
   'variables': {
     'use_native_jni_exports': 1,
   },
-  'conditions': [
-    [ 'android_webview_build==1', {
-      'dependencies': [
-        # When building inside the android tree we also need to depend on all
-        # the java sources generated from templates which will be needed by
-        # android_webview_java in android_webview/java_library_common.mk.
-        '../base/base.gyp:base_java_application_state',
-        '../base/base.gyp:base_java_library_load_from_apk_status_codes',
-        '../base/base.gyp:base_java_library_process_type',
-        '../base/base.gyp:base_java_memory_pressure_level',
-        '../content/content.gyp:console_message_level_java',
-        '../content/content.gyp:content_gamepad_mapping',
-        '../content/content.gyp:gesture_event_type_java',
-        '../content/content.gyp:invalidate_types_java',
-        '../content/content.gyp:navigation_controller_java',
-        '../content/content.gyp:popup_item_type_java',
-        '../content/content.gyp:result_codes_java',
-        '../content/content.gyp:screen_orientation_values_java',
-        '../content/content.gyp:speech_recognition_error_java',
-        '../content/content.gyp:top_controls_state_java',
-        '../media/media.gyp:media_android_imageformat',
-        '../net/net.gyp:cert_verify_status_android_java',
-        '../net/net.gyp:certificate_mime_types_java',
-        '../net/net.gyp:network_change_notifier_types_java',
-        '../net/net.gyp:net_errors_java',
-        '../net/net.gyp:private_key_types_java',
-        '../third_party/WebKit/public/blink_headers.gyp:web_input_event_java',
-        '../third_party/WebKit/public/blink_headers.gyp:web_text_input_type',
-        '../ui/android/ui_android.gyp:android_resource_type_java',
-        '../ui/android/ui_android.gyp:bitmap_format_java',
-        '../ui/android/ui_android.gyp:page_transition_types_java',
-        '../ui/android/ui_android.gyp:system_ui_resource_type_java',
-        '../ui/android/ui_android.gyp:touch_device_types_java',
-        '../ui/android/ui_android.gyp:window_open_disposition_java',
-        '../ui/android/ui_android.gyp:text_input_type_java',
-        '../ui/touch_selection/ui_touch_selection.gyp:selection_event_type_java',
-        '../ui/touch_selection/ui_touch_selection.gyp:touch_handle_orientation_java',
-        # We also need to depend on the Java bindings generated from the .mojom files.
-        '../device/battery/battery.gyp:device_battery_mojo_bindings_for_webview',
-      ],
-      # Enable feedback-directed optimisation for the library when building in
-      # android.
-      'aosp_build_settings': {
-        'LOCAL_FDO_SUPPORT': 'true',
-      },
-    }],
-  ],
   'sources': [
     'lib/main/webview_entry_point.cc',
   ],