Revert "Safebrowsing: allow sending enhanced download protection pings on OSX."

chrome/browser/safe_browsing/download_protection_service.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 "chrome/browser/safe_browsing/download_protection_service.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
@@ skipping 586 matching lines @@
     }
 
     if (!pingback_enabled_) {
       PostFinishTask(UNKNOWN, REASON_PING_DISABLED);
       return;
     }
 
     // Currently, the UI only works on Windows so we don't even bother with
     // pinging the server if we're not on Windows.
     // TODO(noelutz): change this code once the UI is done for Linux and Mac.
-#if defined(OS_MACOSX)
-  // TODO(mattm): remove this (see crbug.com/414834).
-  if (base::FieldTrialList::FindFullName("SafeBrowsingOSXClientDownloadPings")
-      != "Enabled") {
-    PostFinishTask(UNKNOWN, REASON_OS_NOT_SUPPORTED);
-    return;
-  }
-#endif
-#if defined(OS_WIN) || defined(OS_MACOSX)
+#if defined(OS_WIN)
     // The URLFetcher is owned by the UI thread, so post a message to
     // start the pingback.
     BrowserThread::PostTask(
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&CheckClientDownloadRequest::GetTabRedirects, this));
 #else
     PostFinishTask(UNKNOWN, REASON_OS_NOT_SUPPORTED);
 #endif
   }
@@ skipping 144 matching lines @@
                             base::TimeTicks::Now() - timeout_start_time_);
       }
     }
     if (service_) {
       VLOG(2) << "SafeBrowsing download verdict for: "
               << item_->DebugString(true) << " verdict:" << reason
               << " result:" << result;
       UMA_HISTOGRAM_ENUMERATION("SBClientDownload.CheckDownloadStats",
                                 reason,
                                 REASON_MAX);
-#if defined(OS_MACOSX)
-      // OSX is currently sending pings only for evaluation purposes, ignore
-      // the result for now.
-      // TODO(mattm): remove this and update the ifdef in
-      // DownloadItemImpl::IsDangerous (see crbug.com/413968).
-      result = UNKNOWN;
-#endif
       callback_.Run(result);
       item_->RemoveObserver(this);
       item_ = NULL;
       DownloadProtectionService* service = service_;
       service_ = NULL;
       service->RequestFinished(this);
       // DownloadProtectionService::RequestFinished will decrement our refcount,
       // so we may be deleted now.
     } else {
       callback_.Run(UNKNOWN);
@@ skipping 129 matching lines @@
   // The client will release itself once it is done.
   BrowserThread::PostTask(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&DownloadUrlSBClient::StartCheck, client));
 }
 
 bool DownloadProtectionService::IsSupportedDownload(
     const content::DownloadItem& item,
     const base::FilePath& target_path) const {
-  // Currently, the UI is only enabled on Windows.  On Mac we send the ping but
-  // ignore the result (see ifdef in FinishRequest).  On Linux we still
+  // Currently, the UI only works on Windows.  On Linux and Mac we still
   // want to show the dangerous file type warning if the file is possibly
   // dangerous which means we have to always return false here.
 #if defined(OS_WIN)
   DownloadCheckResultReason reason = REASON_MAX;
   ClientDownloadRequest::DownloadType type =
       ClientDownloadRequest::WIN_EXECUTABLE;
-  return (CheckClientDownloadRequest::IsSupportedDownload(
-              item, target_path, &reason, &type) &&
-          (ClientDownloadRequest::CHROME_EXTENSION != type));
+  return (CheckClientDownloadRequest::IsSupportedDownload(item, target_path,
+                                                          &reason, &type) &&
+          (ClientDownloadRequest::ANDROID_APK == type ||
+           ClientDownloadRequest::WIN_EXECUTABLE == type ||
+           ClientDownloadRequest::ZIPPED_EXECUTABLE == type));
 #else
   return false;
 #endif
 }
 
 void DownloadProtectionService::CancelPendingRequests() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   for (std::set<scoped_refptr<CheckClientDownloadRequest> >::iterator it =
            download_requests_.begin();
        it != download_requests_.end();) {
@@ skipping 107 matching lines @@
 GURL DownloadProtectionService::GetDownloadRequestUrl() {
   GURL url(kDownloadRequestUrl);
   std::string api_key = google_apis::GetAPIKey();
   if (!api_key.empty())
     url = url.Resolve("?key=" + net::EscapeQueryParamValue(api_key, true));
 
   return url;
 }
 
 }  // namespace safe_browsing