| Index: chrome/browser/extensions/chrome_url_request_util.cc
|
| diff --git a/chrome/browser/extensions/chrome_url_request_util.cc b/chrome/browser/extensions/chrome_url_request_util.cc
|
| index efea0c08bcb76893530e05f2276f1654978aba9f..455115105cfef3568a4e77351c98325e02a1cf09 100644
|
| --- a/chrome/browser/extensions/chrome_url_request_util.cc
|
| +++ b/chrome/browser/extensions/chrome_url_request_util.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/path_service.h"
|
| -#include "base/profiler/scoped_tracker.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/stringprintf.h"
|
| @@ -64,35 +63,14 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
|
| std::string* charset,
|
| scoped_refptr<base::RefCountedMemory>* data,
|
| const net::CompletionCallback& callback) const override {
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "422489 URLRequestResourceBundleJob::GetData"));
|
| -
|
| const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
|
| -
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile1(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "422489 URLRequestResourceBundleJob::GetData 1"));
|
| -
|
| *data = rb.LoadDataResourceBytes(resource_id_);
|
|
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile2(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "422489 URLRequestResourceBundleJob::GetData 2"));
|
| -
|
| // Add the Content-Length header now that we know the resource length.
|
| response_info_.headers->AddHeader(
|
| base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
|
| base::UintToString((*data)->size()).c_str()));
|
|
|
| - // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
|
| - tracked_objects::ScopedTracker tracking_profile3(
|
| - FROM_HERE_WITH_EXPLICIT_FUNCTION(
|
| - "422489 URLRequestResourceBundleJob::GetData 3"));
|
| -
|
| std::string* read_mime_type = new std::string;
|
| bool posted = base::PostTaskAndReplyWithResult(
|
| BrowserThread::GetBlockingPool(), FROM_HERE,
|
|
|