Roll out v1 of the client-side phishing detection model, to replace v0.

chrome/browser/safe_browsing/client_side_detection_service.cc

 // Copyright (c) 2011 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/client_side_detection_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util_proxy.h"
 #include "base/logging.h"
@@ skipping 23 matching lines @@
 
 const base::TimeDelta ClientSideDetectionService::kReportsInterval =
     base::TimeDelta::FromDays(1);
 const base::TimeDelta ClientSideDetectionService::kNegativeCacheInterval =
     base::TimeDelta::FromDays(1);
 const base::TimeDelta ClientSideDetectionService::kPositiveCacheInterval =
     base::TimeDelta::FromMinutes(30);
 
 const char ClientSideDetectionService::kClientReportPhishingUrl[] =
     "https://sb-ssl.google.com/safebrowsing/clientreport/phishing";
+// Note: when updatng the model version, don't forget to change the filename
+// in chrome/common/chrome_constants.cc as well, or else existing users won't
+// download the new model.
+//
+// TODO(bryner): add version metadata so that clients can download new models
+// without needing a new model filename.
 const char ClientSideDetectionService::kClientModelUrl[] =
-    "https://ssl.gstatic.com/safebrowsing/csd/client_model_v0.pb";
+    "https://ssl.gstatic.com/safebrowsing/csd/client_model_v1.pb";
 
 struct ClientSideDetectionService::ClientReportInfo {
   scoped_ptr<ClientReportPhishingRequestCallback> callback;
   GURL phishing_url;
 };
 
 ClientSideDetectionService::CacheState::CacheState(bool phish, base::Time time)
     : is_phishing(phish),
       timestamp(time) {}
 
@@ skipping 36 matching lines @@
       service.get()->callback_factory_.NewCallback(
           &ClientSideDetectionService::OpenModelFileDone);
   if (!base::FileUtilProxy::CreateOrOpen(
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
           model_path,
           base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
           cb)) {
     delete cb;
     return NULL;
   }
+
+  // Delete the previous-version model file.
+  // TODO(bryner): Remove this for M14.
+  base::FileUtilProxy::Delete(
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
+      model_path.DirName().AppendASCII("Safe Browsing Phishing Model"),
+      false /* not recursive */,
+      NULL /* not interested in result */);
   return service.release();
 }
 
 void ClientSideDetectionService::SendClientReportPhishingRequest(
     ClientPhishingRequest* verdict,
     ClientReportPhishingRequestCallback* callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(
@@ skipping 327 matching lines @@
     } else {
       DLOG(FATAL) << "Unable to parse IP address range: "
                   << kPrivateNetworks[i];
       return false;
     }
   }
   return true;
 }
 
 }  // namespace safe_browsing