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

chrome/browser/safe_browsing/protocol_manager.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_H_
 #define CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_
 
 // A class that implements Chrome's interface with the SafeBrowsing protocol.
 // See https://developers.google.com/safe-browsing/developers_guide_v2 for
 // protocol details.
@@ skipping 359 matching lines @@
   // The current reason why the backup update request is happening.
   BackupUpdateReason backup_update_reason_;
 
   // Data to POST when doing an update.
   std::string update_list_data_;
 
   // When true, protocol manager will not start an update unless
   // ForceScheduleNextUpdate() is called. This is set for testing purpose.
   bool disable_auto_update_;
 
-#if defined(OS_ANDROID)
-  // When true, protocol_manager will not check network connection
-  // type when scheduling next update. This is set for testing purpose.
-  bool disable_connection_check_;
-#endif
-
   // ID for URLFetchers for testing.
   int url_fetcher_id_;
 
   // Whether the app is in foreground or background.
   bool app_in_foreground_;
 
   DISALLOW_COPY_AND_ASSIGN(SafeBrowsingProtocolManager);
 };
 
 // Interface of a factory to create ProtocolManager.  Useful for tests.
@@ skipping 43 matching lines @@
   virtual void AddChunks(const std::string& list,
                          scoped_ptr<ScopedVector<SBChunkData> > chunks,
                          AddChunksCallback callback) = 0;
 
   // Delete chunks from the database.
   virtual void DeleteChunks(
       scoped_ptr<std::vector<SBChunkDelete> > chunk_deletes) = 0;
 };
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_PROTOCOL_MANAGER_H_