Revert "Re-land: Add download_file_types.proto with ascii->binary conversion, as a resource."

chrome/chrome_resources.gyp

 # Copyright (c) 2012 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.
 {
   'variables': {
     # Apply Chrome-specific grit settings to all of this file.
     # The advantage is that one entry here applies to the entire file.
     # The caveat is these variables cannot be merged with other variable
     # dictionaries in more inner scopes. If the variable should be merged,
     # consider putting them in a gypi file and including it at the right scope
@@ skipping 204 matching lines @@
             {
               # GN version: //chrome/common:extensions_api_resources
               'action_name': 'generate_extensions_api_resources',
               'variables': {
                 'grit_grd_file': 'common/extensions_api_resources.grd',
               },
               'includes': [ 'chrome_grit_action.gypi' ],
             }
           ],
         }],
-        ['OS != "android" and OS != "ios"', {
-          'dependencies': [ 'make_file_types_protobuf' ]
-        }],
       ],
       'includes': [ '../build/grit_target.gypi' ],
     },
     {
       # TODO(mark): It would be better if each static library that needed
       # to run grit would list its own .grd files, but unfortunately some
       # of the static libraries currently have circular dependencies among
       # generated headers.
       #
       # GN version: //chrome:strings
@@ skipping 51 matching lines @@
         {
           # GN version: //chrome/app:settings_google_chrome_strings
           'action_name': 'generate_settings_google_chrome_strings',
           'variables': {
             'grit_grd_file': 'app/settings_google_chrome_strings.grd',
           },
           'includes': [ 'chrome_grit_action.gypi' ],
         },
       ],
     },
-
-    {
-      # GN version: //chrome/browser/resources/safe_browsing:make_file_types_protobuf
-      # Convert the ascii proto file to a binary resource.
-      'target_name': 'make_file_types_protobuf',
-      'type': 'none',
-      'hard_dependency': 1,
-      'dependencies': [
-        'chrome.gyp:safe_browsing_proto',
-        '<(DEPTH)/third_party/protobuf/protobuf.gyp:py_proto',
-      ],
-      'actions': [
-        {
-          'action_name': 'generate_file_types_protobuf',
-          'variables' : {
-            'script_file':'browser/resources/safe_browsing/gen_file_type_proto.py',
-            'asciipb_file' : 'browser/resources/safe_browsing/download_file_types.asciipb',
-            'output_file' : '<(SHARED_INTERMEDIATE_DIR)/chrome/browser/resources/safe_browsing/download_file_types.pb',
-          },
-          'inputs': [
-            '<(script_file)',
-            '<(asciipb_file)',
-          ],
-          'outputs': [
-            '<(output_file)',
-          ],
-          'action': [
-            'python', '<(script_file)',
-            '-i', '<(asciipb_file)',
-            '-o', '<(output_file)',
-            '-p', '<(PRODUCT_DIR)/pyproto',
-            '-p', '<(PRODUCT_DIR)/pyproto/chrome/common/safe_browsing',
-          ],
-          'message': 'Generating download_file_types.pb.',
-        }
-      ],
-    },
     {
       # GN version: //chrome/browser/metrics/variations:chrome_ui_string_overrider_factory_gen_sources
       'target_name': 'make_chrome_ui_string_overrider_factory',
       'type': 'none',
       'hard_dependency': 1,
       'dependencies': [
         'chrome_strings',
         '../components/components_strings.gyp:components_strings',
       ],
       'actions': [
@@ skipping 375 matching lines @@
               '<(SHARED_INTERMEDIATE_DIR)/chrome/webui_test_resources.pak',
             ],
             'pak_output': '<(PRODUCT_DIR)/browser_tests.pak',
           },
           'includes': [ '../build/repack_action.gypi' ],
         },
       ],
     },
   ], # targets
 }