Add NewTabPage.TileType and .TileTypeClicked on Android

There already are versions of these split by tile source, but the accumulated totals weren't there.

BUG=611341

Review-Url: https://codereview.chromium.org/2131133003
Cr-Commit-Position: refs/heads/master@{#405199}

components/ntp_tiles/most_visited_sites.cc

@@ -237,6 +237,9 @@ void MostVisitedSites::RecordTileTypeMetrics(
   for (size_t i = 0; i < tile_types.size(); ++i) {
     int tile_type = tile_types[i];
     ++counts_per_type[tile_type];
+
+    UMA_HISTOGRAM_ENUMERATION("NewTabPage.TileType", tile_type, NUM_TILE_TYPES);
+
     std::string histogram = base::StringPrintf(
         "NewTabPage.TileType.%s",
         GetSourceHistogramName(sources[i]).c_str());
@@ -260,6 +263,9 @@ void MostVisitedSites::RecordOpenedMostVisitedItem(int index,
       "NewTabPage.MostVisited.%s", GetSourceHistogramName(source).c_str());
   LogHistogramEvent(histogram, index, num_sites_);
 
+  UMA_HISTOGRAM_ENUMERATION(
+      "NewTabPage.TileTypeClicked", tile_type, NUM_TILE_TYPES);
+
   histogram = base::StringPrintf("NewTabPage.TileTypeClicked.%s",
                                  GetSourceHistogramName(source).c_str());
   LogHistogramEvent(histogram, tile_type, NUM_TILE_TYPES);