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

chrome/browser/safe_browsing/protocol_manager_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_HELPER_H_
 #define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_HELPER_H_
 
 // A class that provides common functionality for safebrowsing protocol managers
 // that communicate with Google servers.
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 
 
 struct SafeBrowsingProtocolConfig {
   SafeBrowsingProtocolConfig();
   ~SafeBrowsingProtocolConfig();
   std::string client_name;
   std::string url_prefix;
   std::string backup_connect_error_url_prefix;
   std::string backup_http_error_url_prefix;
   std::string backup_network_error_url_prefix;
   std::string version;
   bool disable_auto_update;
-#if defined(OS_ANDROID)
-  bool disable_connection_check;
-#endif
 };
 
 class SafeBrowsingProtocolManagerHelper {
  public:
   // returns version
   static std::string Version();
 
   // Composes a URL using |prefix|, |method| (e.g.: gethash, download, report).
   // |client_name| and |version|. When not empty, |additional_query| is
   // appended to the URL with an additional "&" in the front.
@@ skipping 10 matching lines @@
                                 const std::string& client_name,
                                 const std::string& version,
                                 const std::string& additional_query,
                                 bool is_extended_reporting);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(SafeBrowsingProtocolManagerHelper);
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_HELPER_H_