Remove safe_browsing=2 functionality, replace with =3 mode.

chrome/chrome_browser.gypi

 # Copyright 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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 2401 matching lines @@
       'browser/profiles/profile_shortcut_manager_win.h',
       'browser/profiles/profiles_state.cc',
       'browser/profiles/profiles_state.h',
       'browser/profiles/storage_partition_descriptor.h',
     ],
     'chrome_browser_rlz_sources': [
       'browser/rlz/chrome_rlz_tracker_delegate.cc',
       'browser/rlz/chrome_rlz_tracker_delegate.h',
     ],
     # "Safe Browsing Basic" files used for safe browsing in full mode
-    # (safe_browsing=1), mobile (=2), and mobile-extended (=3).
+    # (safe_browsing=1) and mobile (=2)
     'chrome_browser_safe_browsing_basic_sources': [
       'browser/renderer_host/data_reduction_proxy_resource_throttle_android.cc',
       'browser/renderer_host/data_reduction_proxy_resource_throttle_android.h',
       'browser/safe_browsing/malware_details.cc',
       'browser/safe_browsing/malware_details.h',
       'browser/safe_browsing/malware_details_cache.cc',
       'browser/safe_browsing/malware_details_cache.h',
       'browser/safe_browsing/malware_details_history.cc',
       'browser/safe_browsing/malware_details_history.h',
       'browser/safe_browsing/ping_manager.cc',
       'browser/safe_browsing/ping_manager.h',
       'browser/safe_browsing/protocol_manager_helper.cc',
       'browser/safe_browsing/protocol_manager_helper.h',
       'browser/safe_browsing/safe_browsing_blocking_page.cc',
       'browser/safe_browsing/safe_browsing_blocking_page.h',
       'browser/safe_browsing/safe_browsing_service.cc',
       'browser/safe_browsing/safe_browsing_service.h',
       'browser/safe_browsing/safe_browsing_util.cc',
       'browser/safe_browsing/safe_browsing_util.h',
       'browser/safe_browsing/ui_manager.cc',
       'browser/safe_browsing/ui_manager.h',
     ],
-    # "Safe Browsing Extended Mobile" files in addition to the "basic" ones
-    # to use for mobile_extended mode. This has some in common with "full."
-    'chrome_browser_safe_browsing_mobile_extended_sources': [
+    # "Safe Browsing Mobile" files in addition to the "basic" ones
+    # to use for mobile mode. This has some in common with "full."
+    'chrome_browser_safe_browsing_mobile_sources': [
       'browser/renderer_host/safe_browsing_resource_throttle.cc',
       'browser/renderer_host/safe_browsing_resource_throttle.h',
       'browser/safe_browsing/database_manager.h',
       'browser/safe_browsing/remote_database_manager.cc',
       'browser/safe_browsing/remote_database_manager.h',
       'browser/safe_browsing/safe_browsing_api_handler.cc',
       'browser/safe_browsing/safe_browsing_api_handler.h',
       'browser/safe_browsing/safe_browsing_api_handler_util.cc',
       'browser/safe_browsing/safe_browsing_api_handler_util.h',
     ],
     # "Safe Browsing Full" files in addition to the "basic" ones to use for
-    # full safe browsing. This has some in common with "mobile_extended."
+    # full safe browsing. This has some in common with "mobile."
     'chrome_browser_safe_browsing_full_sources': [
       'browser/download/download_completion_blocker.cc',
       'browser/download/download_completion_blocker.h',
       'browser/renderer_host/safe_browsing_resource_throttle.cc',
       'browser/renderer_host/safe_browsing_resource_throttle.h',
       'browser/safe_browsing/browser_feature_extractor.cc',
       'browser/safe_browsing/browser_feature_extractor.h',
       'browser/safe_browsing/browser_features.cc',
       'browser/safe_browsing/browser_features.h',
       'browser/safe_browsing/chunk_range.cc',
@@ skipping 1025 matching lines @@
                 'safe_browsing_proto',
               ],
               'conditions': [
                 ['OS=="win"', {
                   'dependencies': [
                     'incident_reporting_state_store_data_proto',
                   ],
                 }],
               ],
             }],
-            ['safe_browsing == 3', {
-              'sources': [ '<@(chrome_browser_safe_browsing_mobile_extended_sources)' ],
+            ['safe_browsing == 2', {
+              'sources': [ '<@(chrome_browser_safe_browsing_mobile_sources)' ],
               'dependencies': [
                 'safe_browsing_proto',
               ],
             }],
           ],
         }],
         ['use_udev == 1', {
           'dependencies': [
             '../device/udev_linux/udev.gyp:udev_linux',
           ],
@@ skipping 605 matching lines @@
             '../components/components.gyp:omnibox_browser',
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
           ],
         },
       ],
     }],
   ],
 }