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

chrome/browser/safe_browsing/protocol_manager_helper.cc

 // 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.
 
 #include "chrome/browser/safe_browsing/protocol_manager_helper.h"
 
 #ifndef NDEBUG
 #include "base/base64.h"
 #endif
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/version_info/version_info.h"
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 
 SafeBrowsingProtocolConfig::SafeBrowsingProtocolConfig()
-    : disable_auto_update(false)
-#if defined(OS_ANDROID)
-    , disable_connection_check(false)
-#endif
-{
-}
+    : disable_auto_update(false) {}
 
-SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() {
-}
+SafeBrowsingProtocolConfig::~SafeBrowsingProtocolConfig() {}
 
 // static
 std::string SafeBrowsingProtocolManagerHelper::Version() {
   if (version_info::GetVersionNumber().empty())
     return "0.1";
   else
     return version_info::GetVersionNumber();
 }
 
 // static
@@ skipping 31 matching lines @@
     bool is_extended_reporting) {
   std::string url =
       ComposeUrl(prefix, method, client_name, version, additional_query);
   if (is_extended_reporting) {
     url.append("&ext=1");
   } else {
     url.append("&ext=0");
   }
   return url;
 }