summaryrefslogtreecommitdiffstats
path: root/extensions/shell/browser
diff options
context:
space:
mode:
authorsvaldez <svaldez@chromium.org>2015-08-24 14:36:20 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-24 21:39:35 +0000
commit5d58c9eb2baa203be1b84ac88cde82c59d72f143 (patch)
tree3446bf04741d0b6e307fdc0b51593323834e680d /extensions/shell/browser
parentcc19cb9a644b1c385b36b108bd9bf5438d8d1f2b (diff)
downloadchromium_src-5d58c9eb2baa203be1b84ac88cde82c59d72f143.zip
chromium_src-5d58c9eb2baa203be1b84ac88cde82c59d72f143.tar.gz
chromium_src-5d58c9eb2baa203be1b84ac88cde82c59d72f143.tar.bz2
Using scoped_ptr for URLRequestJobFactoryImpl::SetProtocolHandler
Adding scoped_ptr to call in order to take ownership of handler. BUG=517161 Review URL: https://codereview.chromium.org/1295523006 Cr-Commit-Position: refs/heads/master@{#345185}
Diffstat (limited to 'extensions/shell/browser')
-rw-r--r--extensions/shell/browser/shell_content_browser_client.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/extensions/shell/browser/shell_content_browser_client.cc b/extensions/shell/browser/shell_content_browser_client.cc
index c9314ad..06cf81b 100644
--- a/extensions/shell/browser/shell_content_browser_client.cc
+++ b/extensions/shell/browser/shell_content_browser_client.cc
@@ -123,7 +123,8 @@ net::URLRequestContextGetter* ShellContentBrowserClient::CreateRequestContext(
(*protocol_handlers)[kExtensionScheme] =
linked_ptr<net::URLRequestJobFactory::ProtocolHandler>(
CreateExtensionProtocolHandler(false /* is_incognito */,
- extension_info_map));
+ extension_info_map)
+ .release());
return browser_main_parts_->browser_context()->CreateRequestContext(
protocol_handlers, request_interceptors.Pass(), extension_info_map);
}