Remove unnecessary instrumentation for several jank bugs.

content/browser/gpu/shader_disk_cache.cc

 // Copyright (c) 2013 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 "content/browser/gpu/shader_disk_cache.h"
 
-#include "base/profiler/scoped_tracker.h"
 #include "base/threading/thread_checker.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/common/constants.h"
 #include "net/base/cache_type.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace content {
 
@@ skipping 235 matching lines @@
 }
 
 void ShaderDiskReadHelper::LoadCache() {
   DCHECK(CalledOnValidThread());
   if (!cache_.get())
     return;
   OnOpComplete(net::OK);
 }
 
 void ShaderDiskReadHelper::OnOpComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 ShaderDiskReadHelper::OnOpComplete"));
-
   DCHECK(CalledOnValidThread());
   if (!cache_.get())
     return;
 
   do {
     switch (op_type_) {
       case OPEN_NEXT:
         rv = OpenNextEntry();
         break;
       case OPEN_NEXT_COMPLETE:
@@ skipping 11 matching lines @@
         break;
       default:
         NOTREACHED();  // Invalid state for read helper
         rv = net::ERR_FAILED;
         break;
     }
   } while (rv != net::ERR_IO_PENDING);
 }
 
 int ShaderDiskReadHelper::OpenNextEntry() {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 ShaderDiskReadHelper::OpenNextEntry"));
-
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
   op_type_ = OPEN_NEXT_COMPLETE;
   if (!iter_)
     iter_ = cache_->backend()->CreateIterator();
   return iter_->OpenNextEntry(
       &entry_, base::Bind(&ShaderDiskReadHelper::OnOpComplete, this));
 }
 
 int ShaderDiskReadHelper::OpenNextEntryComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 ShaderDiskReadHelper::OpenNextEntryComplete"));
-
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
   if (rv == net::ERR_FAILED) {
     iter_.reset();
     op_type_ = ITERATION_FINISHED;
     return net::OK;
   }
 
   if (rv < 0)
     return rv;
 
   op_type_ = READ_COMPLETE;
   buf_ = new net::IOBufferWithSize(entry_->GetDataSize(1));
   return entry_->ReadData(
       1,
       0,
       buf_.get(),
       buf_->size(),
       base::Bind(&ShaderDiskReadHelper::OnOpComplete, this));
 }
 
 int ShaderDiskReadHelper::ReadComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 ShaderDiskReadHelper::ReadComplete"));
-
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
   if (rv && rv == buf_->size()) {
     GpuProcessHost* host = GpuProcessHost::FromID(host_id_);
     if (host)
       host->LoadedShader(entry_->GetKey(), std::string(buf_->data(),
                                                        buf_->size()));
   }
 
   buf_ = NULL;
   entry_->Close();
   entry_ = NULL;
 
   op_type_ = OPEN_NEXT;
   return net::OK;
 }
 
 int ShaderDiskReadHelper::IterationComplete(int rv) {
-  // TODO(vadimt): Remove ScopedTracker below once crbug.com/422516 is fixed.
-  tracked_objects::ScopedTracker tracking_profile(
-      FROM_HERE_WITH_EXPLICIT_FUNCTION(
-          "422516 ShaderDiskReadHelper::IterationComplete"));
-
   DCHECK(CalledOnValidThread());
   // Called through OnOpComplete, so we know |cache_| is valid.
   iter_.reset();
   op_type_ = TERMINATE;
   return net::OK;
 }
 
 ShaderDiskReadHelper::~ShaderDiskReadHelper() {
   if (entry_) {
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
@@ skipping 263 matching lines @@
     const net::CompletionCallback& callback) {
   if (entry_map_.empty()) {
     return net::OK;
   }
   cache_complete_callback_ = callback;
   return net::ERR_IO_PENDING;
 }
 
 }  // namespace content