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

chrome/browser/safe_browsing/safe_browsing_database.cc

Index: chrome/browser/safe_browsing/safe_browsing_database.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_database.cc b/chrome/browser/safe_browsing/safe_browsing_database.cc
index 5a7929e17c12765db3631e4faa7efb8bfb5dc909..f59344881f6c67b29035e6f1faf15d4e0b854292 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database.cc
@@ -73,17 +73,7 @@ const base::FilePath::CharType kUnwantedSoftwareDBFile[] =
 // for little benefit.  If/when file formats change (say to put all
 // the data in one file), that would be a convenient point to rectify
 // this.
-// 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 list name in
-// safe_browsing_util.cc.
-// TODO(shess): Spin up an alternate list id which can be persisted in the
-// store.  Then if a mistake is made, it won't cause confusion between
-// incompatible lists.
-const base::FilePath::CharType kBrowseDBFile[] = FILE_PATH_LITERAL(" Mobile");
-#else
 const base::FilePath::CharType kBrowseDBFile[] = FILE_PATH_LITERAL(" Bloom");
-#endif
 
 // Maximum number of entries we allow in any of the whitelists.
 // If a whitelist on disk contains more entries then all lookups to