Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Side by Side Diff: chrome/browser/extensions/chrome_url_request_util.cc

Issue 747443002: Undoing instrumentations for task URLRequestSimpleJob::StartAsync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removing changes that conflict with another CL Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/appcache/view_appcache_internals_job.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/chrome_url_request_util.h" 5 #include "chrome/browser/extensions/chrome_url_request_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/profiler/scoped_tracker.h"
13 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
16 #include "base/task_runner_util.h" 15 #include "base/task_runner_util.h"
17 #include "chrome/common/chrome_paths.h" 16 #include "chrome/common/chrome_paths.h"
18 #include "chrome/common/extensions/chrome_manifest_url_handlers.h" 17 #include "chrome/common/extensions/chrome_manifest_url_handlers.h"
19 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
20 #include "content/public/browser/resource_request_info.h" 19 #include "content/public/browser/resource_request_info.h"
21 #include "extensions/browser/component_extension_resource_manager.h" 20 #include "extensions/browser/component_extension_resource_manager.h"
22 #include "extensions/browser/extension_protocols.h" 21 #include "extensions/browser/extension_protocols.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 response_info_.headers = extensions::BuildHttpHeaders( 56 response_info_.headers = extensions::BuildHttpHeaders(
58 content_security_policy, send_cors_header, base::Time()); 57 content_security_policy, send_cors_header, base::Time());
59 } 58 }
60 59
61 // Overridden from URLRequestSimpleJob: 60 // Overridden from URLRequestSimpleJob:
62 int GetRefCountedData( 61 int GetRefCountedData(
63 std::string* mime_type, 62 std::string* mime_type,
64 std::string* charset, 63 std::string* charset,
65 scoped_refptr<base::RefCountedMemory>* data, 64 scoped_refptr<base::RefCountedMemory>* data,
66 const net::CompletionCallback& callback) const override { 65 const net::CompletionCallback& callback) const override {
67 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
68 tracked_objects::ScopedTracker tracking_profile(
69 FROM_HERE_WITH_EXPLICIT_FUNCTION(
70 "422489 URLRequestResourceBundleJob::GetData"));
71
72 const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 66 const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
73
74 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
75 tracked_objects::ScopedTracker tracking_profile1(
76 FROM_HERE_WITH_EXPLICIT_FUNCTION(
77 "422489 URLRequestResourceBundleJob::GetData 1"));
78
79 *data = rb.LoadDataResourceBytes(resource_id_); 67 *data = rb.LoadDataResourceBytes(resource_id_);
80 68
81 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
82 tracked_objects::ScopedTracker tracking_profile2(
83 FROM_HERE_WITH_EXPLICIT_FUNCTION(
84 "422489 URLRequestResourceBundleJob::GetData 2"));
85
86 // Add the Content-Length header now that we know the resource length. 69 // Add the Content-Length header now that we know the resource length.
87 response_info_.headers->AddHeader( 70 response_info_.headers->AddHeader(
88 base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength, 71 base::StringPrintf("%s: %s", net::HttpRequestHeaders::kContentLength,
89 base::UintToString((*data)->size()).c_str())); 72 base::UintToString((*data)->size()).c_str()));
90 73
91 // TODO(vadimt): Remove ScopedTracker below once crbug.com/422489 is fixed.
92 tracked_objects::ScopedTracker tracking_profile3(
93 FROM_HERE_WITH_EXPLICIT_FUNCTION(
94 "422489 URLRequestResourceBundleJob::GetData 3"));
95
96 std::string* read_mime_type = new std::string; 74 std::string* read_mime_type = new std::string;
97 bool posted = base::PostTaskAndReplyWithResult( 75 bool posted = base::PostTaskAndReplyWithResult(
98 BrowserThread::GetBlockingPool(), FROM_HERE, 76 BrowserThread::GetBlockingPool(), FROM_HERE,
99 base::Bind(&net::GetMimeTypeFromFile, filename_, 77 base::Bind(&net::GetMimeTypeFromFile, filename_,
100 base::Unretained(read_mime_type)), 78 base::Unretained(read_mime_type)),
101 base::Bind(&URLRequestResourceBundleJob::OnMimeTypeRead, 79 base::Bind(&URLRequestResourceBundleJob::OnMimeTypeRead,
102 weak_factory_.GetWeakPtr(), mime_type, charset, *data, 80 weak_factory_.GetWeakPtr(), mime_type, charset, *data,
103 base::Owned(read_mime_type), callback)); 81 base::Owned(read_mime_type), callback));
104 DCHECK(posted); 82 DCHECK(posted);
105 83
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 resource_id, 178 resource_id,
201 content_security_policy, 179 content_security_policy,
202 send_cors_header); 180 send_cors_header);
203 } 181 }
204 } 182 }
205 return NULL; 183 return NULL;
206 } 184 }
207 185
208 } // namespace chrome_url_request_util 186 } // namespace chrome_url_request_util
209 } // namespace extensions 187 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | content/browser/appcache/view_appcache_internals_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698