Enable Mobile Safe Browsing for Android.

BUG=158341


Review URL: https://chromiumcodereview.appspot.com/11308274

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170649 0039d316-1c4b-4281-b951-d872f2087c98

build/common.gypi

@@ -1088,7 +1088,7 @@
 
         'proprietary_codecs%': '<(proprietary_codecs)',
         'enable_task_manager%': 0,
-        'safe_browsing%': 0,
+        'safe_browsing%': 2,
         'configuration_policy%': 0,
         'input_speech%': 0,
         'enable_web_intents%': 0,

chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

@@ -294,8 +294,8 @@ void ChromeResourceDispatcherHostDelegate::AppendStandardResourceThrottles(
     content::ResourceThrottle* throttle =
         SafeBrowsingResourceThrottleFactory::Create(request, child_id, route_id,
             is_subresource_request, safe_browsing_);
-    DCHECK(throttle);
-    throttles->push_back(throttle);
+    if (throttle)
+      throttles->push_back(throttle);
   }
 #endif