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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 5676166a5515be8d94d8e353c52331f8c9b119b4..819d164e1bad8d5c213165f61213f8f4c6c6c0f7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2419,7 +2419,7 @@
       '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',
@@ -2442,9 +2442,9 @@
       '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',
@@ -2456,7 +2456,7 @@
       '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',
@@ -3502,8 +3502,8 @@
                 }],
               ],
             }],
-            ['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',
               ],