Split to SafeBrowsingDatabaseManager into Local* and Remote*.

build/common.gypi

 # 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 352 matching lines @@
       # currently only works on Linux.
       'use_third_party_translations%': 0,
 
       # Remoting compilation is enabled by default. Set to 0 to disable.
       'remoting%': 1,
 
       # Configuration policy is enabled by default. Set to 0 to disable.
       'configuration_policy%': 1,
 
       # Variable safe_browsing is used to control the build time configuration
-      # for safe browsing feature. Safe browsing can be compiled in 3 different
+      # for safe browsing feature. Safe browsing can be compiled in 4 different
       # levels: 0 disables it, 1 enables it fully, and 2 enables only UI and
-      # reporting features without enabling phishing and malware detection. This
-      # is useful to integrate a third party phishing/malware detection to
-      # existing safe browsing logic.
+      # reporting features for use with Data Saver on Mobile, and 3 enables
+      # extended mobile protection via an external API.  When 3 is fully
+      # deployed, it will replace 2.
       'safe_browsing%': 1,
 
       # Web speech is enabled by default. Set to 0 to disable.
       'enable_web_speech%': 1,
 
       # Notifications are compiled in by default. Set to 0 to disable.
       'notifications%' : 1,
 
       # Use dsymutil to generate real .dSYM files on Mac. The default is 0 for
       # regular builds and 1 for ASan builds.
@@ skipping 1778 matching lines @@
               'variables': {
                 'conditions': [
                   ['OS=="mac" or OS=="ios"', {
                     'clang_lib_path%': '<!(cd <(DEPTH) && pwd -P)/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib',
                   }, { # OS != "mac" or OS != "ios"
                     'clang_lib_path%': '<!(cd <(DEPTH) && pwd -P)/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so',
                   }],
                 ],
               },
               'clang_dynlib_flags%': '-Xclang -load -Xclang <(clang_lib_path) ',
               'clang_plugin_args%': '',

[mattm, 2015/05/06 02:42:45]

For future reference, it's best when updating a CL to upload separate patchsets,
one containing just the rebase, and then one (or more) containing the updates to
the CL. Makes it easier to diff from previous versions.

[Nathan Parker, 2015/05/06 22:27:35]

Yup, sorry, I aim to do that.

             }, { # OS == "win"
               # On Windows, the plugin is built directly into clang, so there's
               # no need to load it dynamically.
               'clang_dynlib_flags%': '',
 
               # Don't error on plugin warnings on Windows until pre-existing warnings
               # are cleaned up.  https://crbug.com/467287
               'clang_plugin_args%': '-Xclang -plugin-arg-find-bad-constructs -Xclang warn-only',
             }]
           ],
@@ skipping 817 matching lines @@
       }],
       ['v8_use_external_startup_data==1', {
        'defines': ['V8_USE_EXTERNAL_STARTUP_DATA'],
       }],
 
       # SAFE_BROWSING_SERVICE - browser manages a safe-browsing service.
       # SAFE_BROWSING_DB_LOCAL - service manages a local database.
       # SAFE_BROWSING_DB_REMOTE - service talks via API to a database
       # SAFE_BROWSING_CSD - enable client-side phishing detection.
       ['safe_browsing==1', {
-        # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
         'defines': [
+          # TODO(nparker): Remove existing uses of FULL_SAFE_BROWSING
           'FULL_SAFE_BROWSING',
           'SAFE_BROWSING_CSD',
           'SAFE_BROWSING_DB_LOCAL',
           'SAFE_BROWSING_SERVICE',
         ],
       }],
       ['safe_browsing==2', {
         'defines': [
           # TODO(nparker): Remove existing uses of MOBILE_SAFE_BROWSING
           'MOBILE_SAFE_BROWSING',
           'SAFE_BROWSING_SERVICE',
         ],
       }],
+      ['safe_browsing==3', {
+        'defines': [
+          # TODO(nparker): Remove existing uses of MOBILE_SAFE_BROWSING
+          'MOBILE_SAFE_BROWSING',
+          'SAFE_BROWSING_DB_REMOTE',
+          'SAFE_BROWSING_SERVICE',
+        ],
+      }],
     ],  # conditions for 'target_defaults'
     'target_conditions': [
       ['<(use_libpci)==1', {
         'defines': ['USE_LIBPCI=1'],
       }],
       ['<(use_openssl)==1', {
         'defines': ['USE_OPENSSL=1'],
       }],
       ['<(use_openssl_certs)==1', {
         'defines': ['USE_OPENSSL_CERTS=1'],
@@ skipping 3138 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }