BASELINE: Update Chromium to 53.0.2785.41

Also adds a few extra files for extensions.

Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 3 insertions, 11 deletions

diff --git a/chromium/components/sync_sessions/favicon_cache.cc b/chromium/components/sync_sessions/favicon_cache.cc
index 3edd698b980..51e9494d3fb 100644
--- a/chromium/components/sync_sessions/favicon_cache.cc
+++ b/chromium/components/sync_sessions/favicon_cache.cc
@@ -280,8 +280,6 @@ syncer::SyncMergeResult FaviconCache::MergeDataAndStartSyncing(
   // they'll be re-added and the appropriate synced favicons will be evicted.
   // TODO(zea): implement a smarter ordering of the which favicons to drop.
   int available_favicons = max_sync_favicon_limit_ - initial_sync_data.size();
-  UMA_HISTOGRAM_BOOLEAN("Sync.FaviconsAvailableAtMerge",
-                        available_favicons > 0);
   for (std::set<GURL>::const_iterator iter = unsynced_favicon_urls.begin();
        iter != unsynced_favicon_urls.end(); ++iter) {
     if (available_favicons > 0) {
@@ -298,7 +296,6 @@ syncer::SyncMergeResult FaviconCache::MergeDataAndStartSyncing(
       merge_result.set_num_items_deleted(merge_result.num_items_deleted() + 1);
     }
   }
-  UMA_HISTOGRAM_COUNTS_10000("Sync.FaviconCount", synced_favicons_.size());
   merge_result.set_num_items_after_association(synced_favicons_.size());
 
   if (type == syncer::FAVICON_IMAGES) {
@@ -621,11 +618,6 @@ void FaviconCache::OnFaviconDataAvailable(
     // TODO(zea): support multiple favicon urls per page.
     page_favicon_map_[page_url] = favicon_url;
 
-    if (!favicon_info->last_visit_time.is_null()) {
-      UMA_HISTOGRAM_COUNTS_10000(
-          "Sync.FaviconVisitPeriod",
-          (now - favicon_info->last_visit_time).InHours());
-    }
     favicon_info->received_local_update = true;
     UpdateFaviconVisitTime(favicon_url, now);
 
diff --git a/chromium/components/sync_sessions/synced_session_tracker_unittest.cc b/chromium/components/sync_sessions/synced_session_tracker_unittest.cc
index 25dddb842cb..9b804aeaa14 100644
--- a/chromium/components/sync_sessions/synced_session_tracker_unittest.cc
+++ b/chromium/components/sync_sessions/synced_session_tracker_unittest.cc
@@ -19,8 +19,8 @@ namespace browser_sync {
 
 namespace {
 
-const std::string kValidUrl = "http://www.example.com";
-const std::string kInvalidUrl = "invalid.url";
+const char kValidUrl[] = "http://www.example.com";
+const char kInvalidUrl[] = "invalid.url";
 
 }  // namespace
 
@@ -173,7 +173,7 @@ TEST_F(SyncedSessionTrackerTest, Complex) {
   ASSERT_TRUE(GetTracker()->LookupSessionTab(tag1, 2, &tab_ptr));
   ASSERT_EQ(tab_ptr, tabs1[2]);
   ASSERT_FALSE(GetTracker()->LookupSessionTab(tag1, 3, &tab_ptr));
-  ASSERT_EQ(static_cast<const sessions::SessionTab*>(NULL), tab_ptr);
+  ASSERT_FALSE(tab_ptr);
 
   std::vector<const sessions::SessionWindow*> windows;
   ASSERT_TRUE(GetTracker()->LookupSessionWindows(tag1, &windows));