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

chrome/browser/safe_browsing/protocol_manager.cc

Index: chrome/browser/safe_browsing/protocol_manager.cc
diff --git a/chrome/browser/safe_browsing/protocol_manager.cc b/chrome/browser/safe_browsing/protocol_manager.cc
index 054d5e1b054529d18a434f5bb62cd200352bfb64..745a9d7fb19accfe351db101641b30a5d4ba21ae 100644
--- a/chrome/browser/safe_browsing/protocol_manager.cc
+++ b/chrome/browser/safe_browsing/protocol_manager.cc
@@ -29,10 +29,6 @@
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 
-#if defined(OS_ANDROID)
-#include "net/base/network_change_notifier.h"
-#endif
-
 using base::Time;
 using base::TimeDelta;
 
@@ -148,9 +144,6 @@ SafeBrowsingProtocolManager::SafeBrowsingProtocolManager(
       url_prefix_(config.url_prefix),
       backup_update_reason_(BACKUP_UPDATE_REASON_MAX),
       disable_auto_update_(config.disable_auto_update),
-#if defined(OS_ANDROID)
-      disable_connection_check_(config.disable_connection_check),
-#endif
       url_fetcher_id_(0),
       app_in_foreground_(true) {
   DCHECK(!url_prefix_.empty());
@@ -235,17 +228,6 @@ void SafeBrowsingProtocolManager::GetNextUpdate() {
   if (request_.get() || request_type_ != NO_REQUEST)
     return;
 
-#if defined(OS_ANDROID)
-  if (!disable_connection_check_) {
-    net::NetworkChangeNotifier::ConnectionType type =
-      net::NetworkChangeNotifier::GetConnectionType();
-    if (type != net::NetworkChangeNotifier::CONNECTION_WIFI) {
-      ScheduleNextUpdate(false /* no back off */);
-      return;
-    }
-  }
-#endif
-
   IssueUpdateRequest();
 }
 
@@ -728,12 +710,6 @@ void SafeBrowsingProtocolManager::UpdateFinished(bool success) {
 
 void SafeBrowsingProtocolManager::UpdateFinished(bool success, bool back_off) {
   DCHECK(CalledOnValidThread());
-#if defined(OS_ANDROID)
-  if (app_in_foreground_)
-    UMA_HISTOGRAM_COUNTS("SB2.UpdateSizeForeground", update_size_);
-  else
-    UMA_HISTOGRAM_COUNTS("SB2.UpdateSizeBackground", update_size_);
-#endif
   UMA_HISTOGRAM_COUNTS("SB2.UpdateSize", update_size_);
   update_size_ = 0;
   bool update_success = success || request_type_ == CHUNK_REQUEST;