Remove the finch gate from the UWS interstitial

chrome/browser/safe_browsing/safe_browsing_util.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/safe_browsing_util.h"
 
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"

[mattm, 2015/05/13 01:46:11]

unused now?

[felt, 2015/05/13 01:56:01]

Done.

 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/safe_browsing/chunk.pb.h"
 #include "components/google/core/browser/google_util.h"
 #include "crypto/sha2.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
 
@@ skipping 143 matching lines @@
 
 namespace {
 bool IsKnownList(const std::string& name) {
   for (size_t i = 0; i < arraysize(safe_browsing_util::kAllLists); ++i) {
     if (!strcmp(safe_browsing_util::kAllLists[i], name.c_str())) {
       return true;
     }
   }
   return false;
 }
-
-// String constants for the M40 UwS Finch trial.
-const char kUnwantedTrialName[] = "UwSInterstitialStatus";
-const char kOff[] = "Off";
-const char kOnButInvisible[] = "OnButInvisible";
-const char kOn[] = "On";
-
 }  // namespace
 
 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";
@@ skipping 336 matching lines @@
   SBFullHash hash_out;
   memcpy(hash_out.full_hash, hash_in.data(), crypto::kSHA256Length);
   return hash_out;
 }
 
 std::string SBFullHashToString(const SBFullHash& hash) {
   DCHECK_EQ(crypto::kSHA256Length, sizeof(hash.full_hash));
   return std::string(hash.full_hash, sizeof(hash.full_hash));
 }
 
-UnwantedStatus GetUnwantedTrialGroup() {
-  std::string status(base::FieldTrialList::FindFullName(kUnwantedTrialName));
-  if (status == kOff)
-    return UWS_OFF;
-  if (status == kOnButInvisible)
-    return UWS_ON_INVISIBLE;
-  if (status == kOn)
-    return UWS_ON;
-  return UWS_ON;
-}
-
 }  // namespace safe_browsing_util