commit 7343865402eca47b15c9ce75fefb66a8bb4550eb
author jam <jam@chromium.org> Mon May 08 21:21:35 2017
committer Commit bot <commit-bot@chromium.org> Mon May 08 21:21:35 2017
tree 63084a8622eb9269cd894cce50fa48a2b33760b5
parent e57c73a2db2ce7fad847d8663748d387fe545390

Simplify how data scheme is handled by the network service.

Review-Url: https://codereview.chromium.org/2866973006
Cr-Commit-Position: refs/heads/master@{#470131}

content/network/network_context.cc

diff --git a/content/network/network_context.cc b/content/network/network_context.cc
index c889176..5cc92b1 100644
--- a/content/network/network_context.cc
+++ b/content/network/network_context.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/logging.h"
-#include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "content/network/url_loader_impl.h"
 #include "content/public/common/content_client.h"
@@ -17,7 +16,6 @@
 #include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_config_service_fixed.h"
-#include "net/url_request/data_protocol_handler.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 
@@ -68,9 +66,7 @@
 
   builder.EnableHttpCache(cache_params);
   builder.set_file_enabled(true);
-
-  builder.SetProtocolHandler(url::kDataScheme,
-                             base::MakeUnique<net::DataProtocolHandler>());
+  builder.set_data_enabled(true);
 
   if (command_line->HasSwitch(switches::kProxyServer)) {
     net::ProxyConfig config;