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

chrome/browser/safe_browsing/protocol_manager.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.h"
 
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 11 matching lines @@
 #include "google_apis/google_api_keys.h"
 #include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #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;
 
 namespace {
 
 // UpdateResult indicates what happened with the primary and/or backup update
 // requests. The ordering of the values must stay the same for UMA consistency,
 // and is also ordered in this way to match ProtocolManager::BackupUpdateReason.
 enum UpdateResult {
   UPDATE_RESULT_FAIL,
@@ skipping 95 matching lines @@
           base::RandInt(kSbTimerStartIntervalSecMin,
                         kSbTimerStartIntervalSecMax))),
       chunk_pending_to_write_(false),
       version_(config.version),
       update_size_(0),
       client_name_(config.client_name),
       request_context_getter_(request_context_getter),
       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());
 
   backup_url_prefixes_[BACKUP_UPDATE_REASON_CONNECT] =
       config.backup_connect_error_url_prefix;
   backup_url_prefixes_[BACKUP_UPDATE_REASON_HTTP] =
       config.backup_http_error_url_prefix;
   backup_url_prefixes_[BACKUP_UPDATE_REASON_NETWORK] =
       config.backup_network_error_url_prefix;
@@ skipping 64 matching lines @@
   fetcher->SetRequestContext(request_context_getter_.get());
   fetcher->SetUploadData("text/plain", get_hash);
   fetcher->Start();
 }
 
 void SafeBrowsingProtocolManager::GetNextUpdate() {
   DCHECK(CalledOnValidThread());
   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();
 }
 
 // net::URLFetcherDelegate implementation ----------------------------------
 
 // All SafeBrowsing request responses are handled here.
 // TODO(paulg): Clarify with the SafeBrowsing team whether a failed parse of a
 //              chunk should retry the download and parse of that chunk (and
 //              what back off / how many times to try), and if that effects the
 //              update back off. For now, a failed parse of the chunk means we
@@ skipping 462 matching lines @@
       &gethash_error_count_, &gethash_back_off_mult_);
   next_gethash_time_ = now + next;
 }
 
 void SafeBrowsingProtocolManager::UpdateFinished(bool success) {
   UpdateFinished(success, !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;
   if (backup_update_reason_ == BACKUP_UPDATE_REASON_MAX) {
     RecordUpdateResult(
         update_success ? UPDATE_RESULT_SUCCESS : UPDATE_RESULT_FAIL);
   } else {
     UpdateResult update_result = static_cast<UpdateResult>(
           UPDATE_RESULT_BACKUP_START +
           (static_cast<int>(backup_update_reason_) * 2) +
@@ skipping 69 matching lines @@
     FullHashCallback callback, bool is_download)
     : callback(callback),
       is_download(is_download) {
 }
 
 SafeBrowsingProtocolManager::FullHashDetails::~FullHashDetails() {
 }
 
 SafeBrowsingProtocolManagerDelegate::~SafeBrowsingProtocolManagerDelegate() {
 }