Remove unnecessary instrumentation for several jank bugs.

net/http/disk_cache_based_quic_server_info.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/http/disk_cache_based_quic_server_info.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
-#include "base/profiler/scoped_tracker.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_session.h"
 #include "net/quic/quic_server_id.h"
 
 namespace net {
 
 // Some APIs inside disk_cache take a handle that the caller must keep alive
@@ skipping 113 matching lines @@
     // Handle updates while a write is pending or if we haven't loaded from disk
     // cache. Save the data to be written into a temporary buffer and then
     // persist that data when we are ready to persist.
     pending_write_data_ = Serialize();
     return;
   }
   PersistInternal();
 }
 
 void DiskCacheBasedQuicServerInfo::PersistInternal() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::PersistInternal"));
-
   DCHECK(CalledOnValidThread());
   DCHECK_NE(GET_BACKEND, state_);
   DCHECK(new_data_.empty());
   CHECK(ready_);
   DCHECK(wait_for_ready_callback_.is_null());
 
   if (pending_write_data_.empty()) {
     new_data_ = Serialize();
   } else {
     new_data_ = pending_write_data_;
@@ skipping 28 matching lines @@
   if (entry_)
     entry_->Close();
 }
 
 std::string DiskCacheBasedQuicServerInfo::key() const {
   return "quicserverinfo:" + server_id_.ToString();
 }
 
 void DiskCacheBasedQuicServerInfo::OnIOComplete(CacheOperationDataShim* unused,
                                                 int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::OnIOComplete"));
-
   DCHECK_NE(NONE, state_);
   rv = DoLoop(rv);
   if (rv == ERR_IO_PENDING)
     return;
 
   base::WeakPtr<DiskCacheBasedQuicServerInfo> weak_this =
       weak_factory_.GetWeakPtr();
 
   if (!wait_for_ready_callback_.is_null()) {
     wait_for_data_end_time_ = base::TimeTicks::Now();
@@ skipping 50 matching lines @@
       default:
         rv = OK;
         NOTREACHED();
     }
   } while (rv != ERR_IO_PENDING && state_ != NONE);
 
   return rv;
 }
 
 int DiskCacheBasedQuicServerInfo::DoGetBackendComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoGetBackendComplete"));
-
   if (rv == OK) {
     backend_ = data_shim_->backend;
     state_ = OPEN;
   } else {
     RecordQuicServerInfoFailure(GET_BACKEND_FAILURE);
     state_ = WAIT_FOR_DATA_READY_DONE;
   }
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoOpenComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoOpenComplete"));
-
   if (rv == OK) {
     entry_ = data_shim_->entry;
     state_ = READ;
     found_entry_ = true;
   } else {
     RecordQuicServerInfoFailure(OPEN_FAILURE);
     state_ = WAIT_FOR_DATA_READY_DONE;
   }
 
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoReadComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoReadComplete"));
-
   if (rv > 0)
     data_.assign(read_buffer_->data(), rv);
   else if (rv < 0)
     RecordQuicServerInfoFailure(READ_FAILURE);
 
   state_ = WAIT_FOR_DATA_READY_DONE;
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoWriteComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoWriteComplete"));
-
   if (rv < 0)
     RecordQuicServerInfoFailure(WRITE_FAILURE);
   state_ = SET_DONE;
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoCreateOrOpenComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoCreateOrOpenComplete"));
-
   if (rv != OK) {
     RecordQuicServerInfoFailure(CREATE_OR_OPEN_FAILURE);
     state_ = SET_DONE;
   } else {
     if (!entry_) {
       entry_ = data_shim_->entry;
       found_entry_ = true;
     }
     DCHECK(entry_);
     state_ = WRITE;
   }
   return OK;
 }
 
 int DiskCacheBasedQuicServerInfo::DoGetBackend() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoGetBackend"));
-
   state_ = GET_BACKEND_COMPLETE;
   return http_cache_->GetBackend(&data_shim_->backend, io_callback_);
 }
 
 int DiskCacheBasedQuicServerInfo::DoOpen() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoOpen"));
-
   state_ = OPEN_COMPLETE;
   return backend_->OpenEntry(key(), &data_shim_->entry, io_callback_);
 }
 
 int DiskCacheBasedQuicServerInfo::DoRead() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoRead"));
-
   const int32 size = entry_->GetDataSize(0 /* index */);
   if (!size) {
     state_ = WAIT_FOR_DATA_READY_DONE;
     return OK;
   }
 
   read_buffer_ = new IOBuffer(size);
   state_ = READ_COMPLETE;
   return entry_->ReadData(
       0 /* index */, 0 /* offset */, read_buffer_.get(), size, io_callback_);
 }
 
 int DiskCacheBasedQuicServerInfo::DoWrite() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoWrite"));
-
   write_buffer_ = new IOBuffer(new_data_.size());
   memcpy(write_buffer_->data(), new_data_.data(), new_data_.size());
   state_ = WRITE_COMPLETE;
 
   return entry_->WriteData(0 /* index */,
                            0 /* offset */,
                            write_buffer_.get(),
                            new_data_.size(),
                            io_callback_,
                            true /* truncate */);
 }
 
 int DiskCacheBasedQuicServerInfo::DoCreateOrOpen() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoCreateOrOpen"));
-
   state_ = CREATE_OR_OPEN_COMPLETE;
   if (entry_)
     return OK;
 
   if (found_entry_) {
     return backend_->OpenEntry(key(), &data_shim_->entry, io_callback_);
   }
 
   return backend_->CreateEntry(key(), &data_shim_->entry, io_callback_);
 }
 
 int DiskCacheBasedQuicServerInfo::DoWaitForDataReadyDone() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 DiskCacheBasedQuicServerInfo::DoWaitForDataReadyDone"));
-
   DCHECK(!ready_);
   state_ = NONE;
   ready_ = true;
   // We close the entry because, if we shutdown before ::Persist is called,
   // then we might leak a cache reference, which causes a DCHECK on shutdown.
   if (entry_)
     entry_->Close();
   entry_ = NULL;
 
   RecordQuicServerInfoStatus(QUIC_SERVER_INFO_PARSE);
@@ skipping 51 matching lines @@
   } else if (backend_->GetCacheType() == net::MEMORY_CACHE) {
     UMA_HISTOGRAM_ENUMERATION("Net.QuicDiskCache.FailureReason.MemoryCache",
                               failure, NUM_OF_FAILURES);
   } else {
     UMA_HISTOGRAM_ENUMERATION("Net.QuicDiskCache.FailureReason.DiskCache",
                               failure, NUM_OF_FAILURES);
   }
 }
 
 }  // namespace net