Update from chromium a8e7c94b1b79a0948d05a1fcfff53391d22ce37a

net/ssl/default_channel_id_store.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 "net/ssl/default_channel_id_store.h"
 
 #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 {
 
 // --------------------------------------------------------------------------
 // Task
 class DefaultChannelIDStore::Task {
  public:
   virtual ~Task();
 
@@ skipping 34 matching lines @@
     const GetChannelIDCallback& callback)
     : server_identifier_(server_identifier),
       callback_(callback) {
 }
 
 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;
   int err = store->GetChannelID(
       server_identifier_, &expiration_time, &private_key_result,
       &cert_result, GetChannelIDCallback());
   DCHECK(err != ERR_IO_PENDING);
 
   InvokeCallback(base::Bind(callback_, err, server_identifier_,
                             expiration_time, private_key_result, cert_result));
@@ skipping 31 matching lines @@
       expiration_time_(expiration_time),
       private_key_(private_key),
       cert_(cert) {
 }
 
 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_);
 }
 
 // --------------------------------------------------------------------------
 // DeleteChannelIDTask
 class DefaultChannelIDStore::DeleteChannelIDTask
     : public DefaultChannelIDStore::Task {
  public:
   DeleteChannelIDTask(const std::string& server_identifier,
@@ skipping 13 matching lines @@
         : server_identifier_(server_identifier),
           callback_(callback) {
 }
 
 DefaultChannelIDStore::DeleteChannelIDTask::
     ~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_);
 }
 
 // --------------------------------------------------------------------------
 // DeleteAllCreatedBetweenTask
 class DefaultChannelIDStore::DeleteAllCreatedBetweenTask
     : public DefaultChannelIDStore::Task {
  public:
@@ skipping 18 matching lines @@
           delete_end_(delete_end),
           callback_(callback) {
 }
 
 DefaultChannelIDStore::DeleteAllCreatedBetweenTask::
     ~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_);
 }
 
 // --------------------------------------------------------------------------
 // GetAllChannelIDsTask
 class DefaultChannelIDStore::GetAllChannelIDsTask
     : public DefaultChannelIDStore::Task {
  public:
@@ skipping 10 matching lines @@
     GetAllChannelIDsTask(const GetChannelIDListCallback& callback)
         : callback_(callback) {
 }
 
 DefaultChannelIDStore::GetAllChannelIDsTask::
     ~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);
 
   InvokeCallback(base::Bind(callback_, cert_list));
 }
 
 // --------------------------------------------------------------------------
 // DefaultChannelIDStore
 
 DefaultChannelIDStore::DefaultChannelIDStore(
@@ skipping 236 matching lines @@
   if (store_.get())
     store_->AddChannelID(*channel_id);
   channel_ids_[server_identifier] = channel_id;
 }
 
 DefaultChannelIDStore::PersistentStore::PersistentStore() {}
 
 DefaultChannelIDStore::PersistentStore::~PersistentStore() {}
 
 }  // namespace net