Hard coded finch config for Popular site

components/ntp_tiles/most_visited_sites.cc

 // Copyright 2013 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 "components/ntp_tiles/most_visited_sites.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 
-#if defined(OS_ANDROID)
-#include <jni.h>
-#endif
-
 #include "base/callback.h"
-#include "base/command_line.h"
 #include "base/feature_list.h"
-#include "base/metrics/field_trial.h"
-#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/ntp_tiles/constants.h"
+#include "components/ntp_tiles/field_trial.h"
 #include "components/ntp_tiles/icon_cacher.h"
 #include "components/ntp_tiles/metrics.h"
 #include "components/ntp_tiles/pref_names.h"
 #include "components/ntp_tiles/switches.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/pref_service.h"
 
-#if defined(OS_ANDROID)
-#include "base/android/jni_android.h"
-#include "jni/MostVisitedSites_jni.h"
-#endif
-
 using history::TopSites;
 using suggestions::ChromeSuggestion;
 using suggestions::SuggestionsProfile;
 using suggestions::SuggestionsService;
 
 namespace ntp_tiles {
 
 namespace {
 
 const base::Feature kDisplaySuggestionsServiceTiles{
     "DisplaySuggestionsServiceTiles", base::FEATURE_ENABLED_BY_DEFAULT};
 
-bool ShouldShowPopularSites() {
-  // Note: It's important to query the field trial state first, to ensure that
-  // UMA reports the correct group.
-  const std::string group_name =
-      base::FieldTrialList::FindFullName(kPopularSitesFieldTrialName);
-
-  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (cmd_line->HasSwitch(switches::kDisableNTPPopularSites))
-    return false;
-
-  if (cmd_line->HasSwitch(switches::kEnableNTPPopularSites))
-    return true;
-
-#if defined(OS_ANDROID)
-  if (Java_MostVisitedSites_isPopularSitesForceEnabled(
-          base::android::AttachCurrentThread())) {
-    return true;
-  }
-#endif
-
-  return base::StartsWith(group_name, "Enabled",
-                          base::CompareCase::INSENSITIVE_ASCII);
-}
-
 // Determine whether we need any tiles from PopularSites to fill up a grid of
 // |num_tiles| tiles.
 bool NeedPopularSites(const PrefService* prefs, int num_tiles) {
   return prefs->GetInteger(prefs::kNumPersonalTiles) < num_tiles;
 }
 
 bool AreURLsEquivalent(const GURL& url1, const GURL& url2) {
   return url1.host() == url2.host() && url1.path() == url2.path();
 }
 
@@ skipping 31 matching lines @@
   if (supervisor_)
     supervisor_->SetObserver(nullptr);
 }
 
 void MostVisitedSites::SetMostVisitedURLsObserver(Observer* observer,
                                                   int num_sites) {
   DCHECK(observer);
   observer_ = observer;
   num_sites_ = num_sites;
 
-  if (popular_sites_ && ShouldShowPopularSites() &&
-      NeedPopularSites(prefs_, num_sites_)) {
+  if (popular_sites_ && NeedPopularSites(prefs_, num_sites_) &&
+      ShouldShowPopularSites()) {

[noyau (Ping after 24h), 2016/11/09 10:56:39]

I changed the order of the test, to only enroll in the experiment users who are
going to be shown popular site tiles. There is no point of counting existing
users who already have a bunch of tiles.

[rkaplow, 2016/11/10 22:56:46]

makes sense, field trial group should only be triggered IFF it will be used.

However this is a behavior change so make sure any analysis doesn't cross
version border.

[noyau (Ping after 24h), 2016/11/14 17:08:08]

Ok, I'll make sure everyone is aware.

[Marc Treib, 2016/11/16 12:50:29]

Drive-by: This is subtle and not obvious from reading the code. Could you add a
comment saying that the order matters? (Separate CL is fine)

[noyau (Ping after 24h), 2016/11/16 13:06:03]

Done.

     popular_sites_->StartFetch(
         false, base::Bind(&MostVisitedSites::OnPopularSitesAvailable,
                           base::Unretained(this)));
   } else {
     waiting_for_popular_sites_ = false;
   }
 
   if (top_sites_) {
     // TopSites updates itself after a delay. To ensure up-to-date results,
     // force an update now.
@@ skipping 299 matching lines @@
 
 void MostVisitedSites::TopSitesChanged(TopSites* top_sites,
                                        ChangeReason change_reason) {
   if (mv_source_ == NTPTileSource::TOP_SITES) {
     // The displayed tiles are invalidated.
     InitiateTopSitesQuery();
   }
 }
 
 }  // namespace ntp_tiles