Revert of Allow direct and indirect navigation values to be varied via field trial.

chrome/browser/banners/app_banner_settings_helper.cc

 // Copyright 2014 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/banners/app_banner_settings_helper.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
 #include "chrome/browser/banners/app_banner_data_fetcher.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/rappor/rappor_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/escape.h"
@@ skipping 79 matching lines @@
   if (ui::PageTransitionCoreTypeIs(transition_type,
                                    ui::PAGE_TRANSITION_TYPED) ||
       ui::PageTransitionCoreTypeIs(transition_type,
                                    ui::PAGE_TRANSITION_GENERATED)) {
     return kDirectNavigationEngagement;
   } else {
     return kIndirectNavigationEnagagement;
   }
 }
 
-// Queries a field trial for updates to the default engagement values assigned
-// to direct and indirect navigations.
-void UpdateEngagementWeights() {
-  // Expect a field trial value of "X:Y", where X is the direct engagement
-  // value and Y is the indirect engagement value.
-  std::string weights =
-      base::FieldTrialList::FindFullName("AppBannersEngagementWeights");
-  if (weights.empty())
-    return;
-
-  std::vector<std::string> tokens = base::SplitString(
-      weights, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
-  if (tokens.size() == 2) {
-    double direct_engagement = -1;
-    double indirect_engagement = -1;
-
-    // Ensure that we get valid doubles from the field trial, and that both
-    // values are greater than or equal to zero and less than or equal to the
-    // total engagement required to trigger the banner.
-    if (base::StringToDouble(tokens[0], &direct_engagement) &&
-        base::StringToDouble(tokens[1], &indirect_engagement) &&
-        direct_engagement >= 0 && indirect_engagement >= 0 &&
-        direct_engagement <= kTotalEngagementToTrigger &&
-        indirect_engagement <= kTotalEngagementToTrigger) {
-      AppBannerSettingsHelper::SetEngagementWeights(direct_engagement,
-                                                    indirect_engagement);
-    }
-  }
-}
-
-// Queries a field trial for updates to the default number of minutes between
-// site visits counted for the purposes of displaying a banner.
-void UpdateMinutesBetweenVisits() {
-  std::string minutes_between_visits =
-      base::FieldTrialList::FindFullName("AppBannersMinutesBetweenVisits");
-  if (minutes_between_visits.empty())
-    return;
-
-  int minimum_minutes = 0;
-  if (base::StringToInt(minutes_between_visits, &minimum_minutes))
-    AppBannerSettingsHelper::SetMinimumMinutesBetweenVisits(minimum_minutes);
-}
-
 }  // namespace
 
 void AppBannerSettingsHelper::ClearHistoryForURLs(
     Profile* profile,
     const std::set<GURL>& origin_urls) {
   HostContentSettingsMap* settings = profile->GetHostContentSettingsMap();
   for (const GURL& origin_url : origin_urls) {
     ContentSettingsPattern pattern(ContentSettingsPattern::FromURL(origin_url));
     if (!pattern.IsValid())
       continue;
@@ skipping 327 matching lines @@
 
 // Given a time, returns that time scoped to the nearest minute resolution
 // locally. For example, if the resolution is one hour, this function will
 // return the time to the closest (previous) hour in the local time zone.
 base::Time AppBannerSettingsHelper::BucketTimeToResolution(
     base::Time time,
     unsigned int minutes) {
   // Only support resolutions smaller than or equal to one day. Enforce
   // that resolutions divide evenly into one day. Otherwise, default to a
   // day resolution (each time converted to midnight local time).
-  if (minutes == 0 || minutes >= kNumberOfMinutesInADay ||
+  if (minutes == 0 || minutes > kNumberOfMinutesInADay ||
       kNumberOfMinutesInADay % minutes != 0) {
     return time.LocalMidnight();
   }
 
   // Extract the number of minutes past midnight in local time. Divide that
   // number by the resolution size, and return the time converted to local
   // midnight with the resulting truncated number added.
   base::Time::Exploded exploded;
   time.LocalExplode(&exploded);
   int total_minutes = exploded.hour * 60 + exploded.minute;
 
   // Use truncating integer division here.
   return time.LocalMidnight() +
          base::TimeDelta::FromMinutes((total_minutes / minutes) * minutes);
 }
 
-void AppBannerSettingsHelper::UpdateFromFieldTrial() {
-  UpdateEngagementWeights();
-  UpdateMinutesBetweenVisits();
+void AppBannerSettingsHelper::UpdateMinutesBetweenVisits() {
+  std::string minutes_between_visits =
+      base::FieldTrialList::FindFullName("AppBannersMinutesBetweenVisits");
+  int minimum_minutes = 0;
+  if (base::StringToInt(minutes_between_visits, &minimum_minutes))
+    AppBannerSettingsHelper::SetMinimumMinutesBetweenVisits(minimum_minutes);
 }