summaryrefslogtreecommitdiffstats
path: root/storage/browser
diff options
context:
space:
mode:
authorpkasting <pkasting@chromium.org>2015-04-10 18:51:30 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-11 01:52:24 +0000
commit941842cc490245e6bca0fdde11528882f1a89f23 (patch)
tree12aa76c1291af35e94dfa9eafed7604265d4f21d /storage/browser
parent0551801d7124e6e156f2cf336c30ea27ca44ab9b (diff)
downloadchromium_src-941842cc490245e6bca0fdde11528882f1a89f23.zip
chromium_src-941842cc490245e6bca0fdde11528882f1a89f23.tar.gz
chromium_src-941842cc490245e6bca0fdde11528882f1a89f23.tar.bz2
Split bug 423948 into various sub-bugs and remove outdated instrumentation.
BUG=423948,455952,475751,475753,475755,475761 TEST=none TBR=jochen,rvargas,piman Review URL: https://codereview.chromium.org/1077973002 Cr-Commit-Position: refs/heads/master@{#324748}
Diffstat (limited to 'storage/browser')
-rw-r--r--storage/browser/blob/blob_url_request_job.cc6
-rw-r--r--storage/browser/fileapi/file_system_dir_url_request_job.cc6
-rw-r--r--storage/browser/fileapi/file_system_url_request_job.cc6
-rw-r--r--storage/browser/fileapi/file_writer_delegate.cc11
-rw-r--r--storage/browser/fileapi/local_file_stream_reader.cc6
-rw-r--r--storage/browser/fileapi/local_file_stream_writer.cc6
6 files changed, 0 insertions, 41 deletions
diff --git a/storage/browser/blob/blob_url_request_job.cc b/storage/browser/blob/blob_url_request_job.cc
index 7a79dbc..69b4776 100644
--- a/storage/browser/blob/blob_url_request_job.cc
+++ b/storage/browser/blob/blob_url_request_job.cc
@@ -17,7 +17,6 @@
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/numerics/safe_conversions.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/stl_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -93,11 +92,6 @@ void BlobURLRequestJob::Kill() {
bool BlobURLRequestJob::ReadRawData(net::IOBuffer* dest,
int dest_size,
int* bytes_read) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 BlobURLRequestJob::ReadRawData"));
-
DCHECK_NE(dest_size, 0);
DCHECK(bytes_read);
DCHECK_GE(remaining_bytes_, 0);
diff --git a/storage/browser/fileapi/file_system_dir_url_request_job.cc b/storage/browser/fileapi/file_system_dir_url_request_job.cc
index 07b8f8d..cce9c56 100644
--- a/storage/browser/fileapi/file_system_dir_url_request_job.cc
+++ b/storage/browser/fileapi/file_system_dir_url_request_job.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/message_loop/message_loop.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -48,11 +47,6 @@ FileSystemDirURLRequestJob::~FileSystemDirURLRequestJob() {
bool FileSystemDirURLRequestJob::ReadRawData(net::IOBuffer* dest, int dest_size,
int *bytes_read) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 FileSystemDirURLRequestJob::ReadRawData"));
-
int count = std::min(dest_size, static_cast<int>(data_.size()));
if (count > 0) {
memcpy(dest->data(), data_.data(), count);
diff --git a/storage/browser/fileapi/file_system_url_request_job.cc b/storage/browser/fileapi/file_system_url_request_job.cc
index edc1dde..a670573 100644
--- a/storage/browser/fileapi/file_system_url_request_job.cc
+++ b/storage/browser/fileapi/file_system_url_request_job.cc
@@ -12,7 +12,6 @@
#include "base/files/file_util_proxy.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/threading/thread_restrictions.h"
#include "base/time/time.h"
#include "build/build_config.h"
@@ -85,11 +84,6 @@ void FileSystemURLRequestJob::Kill() {
bool FileSystemURLRequestJob::ReadRawData(net::IOBuffer* dest,
int dest_size,
int* bytes_read) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 FileSystemURLRequestJob::ReadRawData"));
-
DCHECK_NE(dest_size, 0);
DCHECK(bytes_read);
DCHECK_GE(remaining_bytes_, 0);
diff --git a/storage/browser/fileapi/file_writer_delegate.cc b/storage/browser/fileapi/file_writer_delegate.cc
index abc9976..f8b1542 100644
--- a/storage/browser/fileapi/file_writer_delegate.cc
+++ b/storage/browser/fileapi/file_writer_delegate.cc
@@ -9,7 +9,6 @@
#include "base/files/file_util_proxy.h"
#include "base/message_loop/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/sequenced_task_runner.h"
#include "base/threading/thread_restrictions.h"
#include "net/base/net_errors.h"
@@ -92,11 +91,6 @@ void FileWriterDelegate::OnSSLCertificateError(net::URLRequest* request,
}
void FileWriterDelegate::OnResponseStarted(net::URLRequest* request) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 FileWriterDelegate::OnResponseStarted"));
-
DCHECK_EQ(request_.get(), request);
if (!request->status().is_success() || request->GetResponseCode() != 200) {
OnError(base::File::FILE_ERROR_FAILED);
@@ -107,11 +101,6 @@ void FileWriterDelegate::OnResponseStarted(net::URLRequest* request) {
void FileWriterDelegate::OnReadCompleted(net::URLRequest* request,
int bytes_read) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 FileWriterDelegate::OnReadCompleted"));
-
DCHECK_EQ(request_.get(), request);
if (!request->status().is_success()) {
OnError(base::File::FILE_ERROR_FAILED);
diff --git a/storage/browser/fileapi/local_file_stream_reader.cc b/storage/browser/fileapi/local_file_stream_reader.cc
index cb219b1..90d4a46 100644
--- a/storage/browser/fileapi/local_file_stream_reader.cc
+++ b/storage/browser/fileapi/local_file_stream_reader.cc
@@ -8,7 +8,6 @@
#include "base/files/file_util_proxy.h"
#include "base/location.h"
#include "base/logging.h"
-#include "base/profiler/scoped_tracker.h"
#include "base/task_runner.h"
#include "net/base/file_stream.h"
#include "net/base/io_buffer.h"
@@ -102,11 +101,6 @@ void LocalFileStreamReader::DidVerifyForOpen(
void LocalFileStreamReader::DidOpenFileStream(
const net::CompletionCallback& callback,
int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 LocalFileStreamReader::DidOpenFileStream"));
-
if (result != net::OK) {
callback.Run(result);
return;
diff --git a/storage/browser/fileapi/local_file_stream_writer.cc b/storage/browser/fileapi/local_file_stream_writer.cc
index c6a1d51..0eb555f 100644
--- a/storage/browser/fileapi/local_file_stream_writer.cc
+++ b/storage/browser/fileapi/local_file_stream_writer.cc
@@ -6,7 +6,6 @@
#include "base/callback.h"
#include "base/message_loop/message_loop.h"
-#include "base/profiler/scoped_tracker.h"
#include "net/base/file_stream.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
@@ -126,11 +125,6 @@ void LocalFileStreamWriter::DidOpen(
const net::CompletionCallback& error_callback,
const base::Closure& main_operation,
int result) {
- // TODO(vadimt): Remove ScopedTracker below once crbug.com/423948 is fixed.
- tracked_objects::ScopedTracker tracking_profile(
- FROM_HERE_WITH_EXPLICIT_FUNCTION(
- "423948 LocalFileStreamWriter::DidOpen"));
-
DCHECK(has_pending_operation_);
DCHECK(stream_impl_.get());