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

chrome/browser/safe_browsing/protocol_manager_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 19 matching lines @@
 
 const char kUrlPrefix[] = "https://prefix.com/foo";
 const char kBackupConnectUrlPrefix[] = "https://alt1-prefix.com/foo";
 const char kBackupHttpUrlPrefix[] = "https://alt2-prefix.com/foo";
 const char kBackupNetworkUrlPrefix[] = "https://alt3-prefix.com/foo";
 const char kClient[] = "unittest";
 const char kAppVer[] = "1.0";
 const char kAdditionalQuery[] = "additional_query";
 const char kUrlSuffix[] = "&ext=0";
 
-#if defined(OS_ANDROID)
-const char kDefaultPhishList[] = "goog-mobilephish-shavar";
-const char kDefaultMalwareList[] = "goog-mobilemalware-shavar";
-#else
 const char kDefaultPhishList[] = "goog-phish-shavar";
 const char kDefaultMalwareList[] = "goog-malware-shavar";
-#endif
 
 // Add-prefix chunk with single prefix.
 const char kRawChunkPayload1[] = {
   '\0', '\0', '\0', '\x08',  // 32-bit payload length in network byte order.
   '\x08',                    // field 1, wire format varint
   '\x03',                    // chunk_number varint 3
   '\x22',                    // field 4, wire format length-delimited
   '\x04',                    // varint 4 length
   'a', 'b', 'c', 'd'         // 4-byte prefix
 };
@@ skipping 27 matching lines @@
 
   scoped_ptr<SafeBrowsingProtocolManager> CreateProtocolManager(
       SafeBrowsingProtocolManagerDelegate* delegate) {
     SafeBrowsingProtocolConfig config;
     config.client_name = kClient;
     config.url_prefix = kUrlPrefix;
     config.backup_connect_error_url_prefix = kBackupConnectUrlPrefix;
     config.backup_http_error_url_prefix = kBackupHttpUrlPrefix;
     config.backup_network_error_url_prefix = kBackupNetworkUrlPrefix;
     config.version = kAppVer;
-#if defined(OS_ANDROID)
-    config.disable_connection_check = true;
-#endif
     return scoped_ptr<SafeBrowsingProtocolManager>(
         SafeBrowsingProtocolManager::Create(delegate, NULL, config));
   }
 
   void ValidateUpdateFetcherRequest(const net::TestURLFetcher* url_fetcher,
                                     const std::string& expected_prefix,
                                     const std::string& expected_suffix) {
     ASSERT_TRUE(url_fetcher);
     EXPECT_EQ(net::LOAD_DISABLE_CACHE, url_fetcher->GetLoadFlags());
 
@@ skipping 1025 matching lines @@
   second_chunk_url_fetcher->delegate()->OnURLFetchComplete(
       second_chunk_url_fetcher);
 
   EXPECT_FALSE(pm->IsUpdateScheduled());
 
   // Invoke the AddChunksCallback to finish the update.
   runner->RunPendingTasks();
 
   EXPECT_TRUE(pm->IsUpdateScheduled());
 }