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

chrome/browser/safe_browsing/safe_browsing_util.cc

Index: chrome/browser/safe_browsing/safe_browsing_util.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 728bd96c2487d1cb43859b9cf6dd4603a82141b5..b4ff66f21827203ca0d393f6199a74d67680f1f6 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -173,16 +173,8 @@ bool IsKnownList(const std::string& name) {
 namespace safe_browsing_util {
 
 // Listnames that browser can process.
-// TODO(shess): This shouldn't be OS-driven <http://crbug.com/394379>
-#if defined(OS_ANDROID)
-// NOTE(shess): This difference is also reflected in the store name in
-// safe_browsing_database.cc.
-const char kMalwareList[] = "goog-mobilemalware-shavar";
-const char kPhishingList[] = "goog-mobilephish-shavar";
-#else
 const char kMalwareList[] = "goog-malware-shavar";
 const char kPhishingList[] = "goog-phish-shavar";
-#endif
 const char kBinUrlList[] = "goog-badbinurl-shavar";
 const char kCsdWhiteList[] = "goog-csdwhite-sha256";
 const char kDownloadWhiteList[] = "goog-downloadwhite-digest256";