Field trial removing tiles from NTP if URL is already open - for 1993 clients

chrome/browser/history/top_sites.cc

Index: chrome/browser/history/top_sites.cc
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 9de804e1f34059a89f8c8395b4aaa211dcafddda..39b9fde1271fd0b7f2bf9109eaa8c96d197a7353 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -5,9 +5,13 @@
 #include "chrome/browser/history/top_sites.h"
 
 #include "base/metrics/field_trial.h"
+#include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
+#include "base/values.h"
 #include "chrome/browser/history/top_sites_impl.h"
 #include "chrome/browser/history/top_sites_likely_impl.h"
+#include "chrome/common/instant_types.h"
+#include "content/public/browser/web_contents.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
@@ -27,6 +31,11 @@ const char kMostVisitedFieldTrialName[] = "MostVisitedTilePlacement";
 const char kOneEightGroupPrefix[] = "OneEight";
 const char kOneFourGroupPrefix[] = "OneFour";
 const char kFlippedSuffix[] = "Flipped";
+const char kTabsGroupName[] = "DontShowOpenTabs";
+
+// Minimum number of Most Visited suggestions required in order for the Most
+// Visited Field Trial to remove a URL already open in the browser.
+const size_t kMinUrlSuggestions = 8;
 
 }  // namespace
 
@@ -69,18 +78,98 @@ void TopSites::MaybeShuffle(MostVisitedURLList* data) {
   // tiles, or the 1st and 8th, or do nothing.
   if (EndsWith(group_name, kFlippedSuffix, true)) {
     size_t index_to_flip = 0;
-    if (StartsWithASCII(group_name, kOneEightGroupPrefix, true) &&
-        data->size() >= 8) {
-      index_to_flip = 7;
-    } else if (StartsWithASCII(group_name, kOneFourGroupPrefix, true) &&
-               data->size() >= 4) {
-      index_to_flip = 3;
+    if (StartsWithASCII(group_name, kOneEightGroupPrefix, true)) {
+      if (data->size() < 8) {
+        UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",

[Alexei Svitkine (slow), 2013/07/04 20:28:30]

I suggest making a helper function to log this histogram that just takes the
enum value.

[annark1, 2013/07/16 18:07:09]

Done.

+            NTP_TILE_EXPERIMENT_ACTION_TOO_FEW_URLS_TILES_1_8,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
+      } else {
+        index_to_flip = 7;
+      }
+    } else if (StartsWithASCII(group_name, kOneFourGroupPrefix, true)) {
+      if (data->size() < 4) {
+        UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",
+            NTP_TILE_EXPERIMENT_ACTION_TOO_FEW_URLS_TILES_1_4,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
+      } else {
+        index_to_flip = 3;
+      }
     }
 
-    if (data->empty() || (*data)[index_to_flip].url.is_empty())
+    if (data->empty() || (*data)[index_to_flip].url.is_empty()) {
+      UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",
+            NTP_TILE_EXPERIMENT_ACTION_NO_URL_TO_FLIP,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
       return;
+    }
     std::swap((*data)[0], (*data)[index_to_flip]);
   }
 }
 
+// static
+bool TopSites::IsClientInTabsGroup() {
+  return base::FieldTrialList::FindFullName(kMostVisitedFieldTrialName) ==
+      kTabsGroupName;
+}
+
+// static
+void TopSites::RemoveItemsMatchingOpenTabs(
+    const std::set<std::string>& open_urls,
+    std::vector<InstantMostVisitedItem>* items) {
+  size_t i = 0;
+  while (i < items->size()) {
+    const std::string url = (*items)[i].url.spec();
+    if (open_urls.count(url) != 0) {
+      if (items->size() <= kMinUrlSuggestions) {
+        UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",
+            NTP_TILE_EXPERIMENT_ACTION_DID_NOT_REMOVE_URL,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
+        ++i;
+      } else {
+        items->erase(items->begin()+i);
+        UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",
+            NTP_TILE_EXPERIMENT_ACTION_REMOVED_URL,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
+      }
+    } else {
+      ++i;
+    }
+  }
+}
+
+// static
+void TopSites::RemovePageValuesMatchingOpenTabs(
+    const std::set<std::string>& open_urls,
+    base::ListValue* pages_value) {
+  size_t i = 0;
+  while (i < pages_value->GetSize()) {
+    base::DictionaryValue* page_value;
+    std::string url;
+    if (pages_value->GetDictionary(i, &page_value) &&
+        page_value->GetString("url", &url) &&
+        open_urls.count(url) != 0) {
+      if (pages_value->GetSize() <= kMinUrlSuggestions) {
+        UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",
+            NTP_TILE_EXPERIMENT_ACTION_DID_NOT_REMOVE_URL,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
+        ++i;
+      } else {
+        pages_value->Remove(*page_value, &i);
+        UMA_HISTOGRAM_ENUMERATION(
+            "NewTabPage.MostVisitedTilePlacementExperiment",
+            NTP_TILE_EXPERIMENT_ACTION_REMOVED_URL,
+            NUM_NTP_TILE_EXPERIMENT_ACTIONS);
+      }
+    } else {
+      ++i;
+    }
+  }
+}
+
 }  // namespace history