Update from chromium https://crrev.com/302282

net/ssl/default_channel_id_store.cc

Index: net/ssl/default_channel_id_store.cc
diff --git a/net/ssl/default_channel_id_store.cc b/net/ssl/default_channel_id_store.cc
index 60e06ed06e7e601d049edc231ad9f0c7097a3e4c..b71d7b3507e13dda8267e21466fdc0e3cd2b35e3 100644
--- a/net/ssl/default_channel_id_store.cc
+++ b/net/ssl/default_channel_id_store.cc
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
-#include "base/profiler/scoped_profile.h"
 #include "net/base/net_errors.h"
 
 namespace net {
@@ -62,11 +61,6 @@ DefaultChannelIDStore::GetChannelIDTask::~GetChannelIDTask() {
 
 void DefaultChannelIDStore::GetChannelIDTask::Run(
     DefaultChannelIDStore* store) {
-  // TODO(vadimt): Remove ScopedProfile below once crbug.com/425814 is fixed.
-  tracked_objects::ScopedProfile tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "425814 DefaultChannelIDStore::GetChannelIDTask::Run"));
-
   base::Time expiration_time;
   std::string private_key_result;
   std::string cert_result;
@@ -118,11 +112,6 @@ DefaultChannelIDStore::SetChannelIDTask::~SetChannelIDTask() {
 
 void DefaultChannelIDStore::SetChannelIDTask::Run(
     DefaultChannelIDStore* store) {
-  // TODO(vadimt): Remove ScopedProfile below once crbug.com/425814 is fixed.
-  tracked_objects::ScopedProfile tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "425814 DefaultChannelIDStore::SetChannelIDTask::Run"));
-
   store->SyncSetChannelID(server_identifier_, creation_time_,
                           expiration_time_, private_key_, cert_);
 }
@@ -156,11 +145,6 @@ DefaultChannelIDStore::DeleteChannelIDTask::
 
 void DefaultChannelIDStore::DeleteChannelIDTask::Run(
     DefaultChannelIDStore* store) {
-  // TODO(vadimt): Remove ScopedProfile below once crbug.com/425814 is fixed.
-  tracked_objects::ScopedProfile tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "425814 DefaultChannelIDStore::DeleteChannelIDTask::Run"));
-
   store->SyncDeleteChannelID(server_identifier_);
 
   InvokeCallback(callback_);
@@ -199,11 +183,6 @@ DefaultChannelIDStore::DeleteAllCreatedBetweenTask::
 
 void DefaultChannelIDStore::DeleteAllCreatedBetweenTask::Run(
     DefaultChannelIDStore* store) {
-  // TODO(vadimt): Remove ScopedProfile below once crbug.com/425814 is fixed.
-  tracked_objects::ScopedProfile tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "425814 DefaultChannelIDStore::DeleteAllCreatedBetweenTask::Run"));
-
   store->SyncDeleteAllCreatedBetween(delete_begin_, delete_end_);
 
   InvokeCallback(callback_);
@@ -234,11 +213,6 @@ DefaultChannelIDStore::GetAllChannelIDsTask::
 
 void DefaultChannelIDStore::GetAllChannelIDsTask::Run(
     DefaultChannelIDStore* store) {
-  // TODO(vadimt): Remove ScopedProfile below once crbug.com/425814 is fixed.
-  tracked_objects::ScopedProfile tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "425814 DefaultChannelIDStore::GetAllChannelIDsTask::Run"));
-
   ChannelIDList cert_list;
   store->SyncGetAllChannelIDs(&cert_list);