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

Side by Side Diff: webkit/tools/test_shell/test_shell_request_context.cc

Issue 15702003: Move webkit/user_agent/ into webkit/common (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 months 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 | Annotate | Revision Log
« no previous file with comments | « webkit/support/webkit_support.gyp ('k') | webkit/user_agent/user_agent.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/tools/test_shell/test_shell_request_context.h" 5 #include "webkit/tools/test_shell/test_shell_request_context.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 14 matching lines...) Expand all
25 #include "net/ssl/ssl_config_service_defaults.h" 25 #include "net/ssl/ssl_config_service_defaults.h"
26 #include "net/url_request/data_protocol_handler.h" 26 #include "net/url_request/data_protocol_handler.h"
27 #include "net/url_request/file_protocol_handler.h" 27 #include "net/url_request/file_protocol_handler.h"
28 #include "net/url_request/http_user_agent_settings.h" 28 #include "net/url_request/http_user_agent_settings.h"
29 #include "net/url_request/url_request_job_factory_impl.h" 29 #include "net/url_request/url_request_job_factory_impl.h"
30 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h" 30 #include "third_party/WebKit/Source/Platform/chromium/public/Platform.h"
31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 31 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
32 #include "webkit/blob/blob_storage_controller.h" 32 #include "webkit/blob/blob_storage_controller.h"
33 #include "webkit/blob/blob_url_request_job_factory.h" 33 #include "webkit/blob/blob_url_request_job_factory.h"
34 #include "webkit/browser/fileapi/file_system_url_request_job_factory.h" 34 #include "webkit/browser/fileapi/file_system_url_request_job_factory.h"
35 #include "webkit/common/user_agent/user_agent.h"
35 #include "webkit/fileapi/file_system_context.h" 36 #include "webkit/fileapi/file_system_context.h"
36 #include "webkit/tools/test_shell/simple_file_system.h" 37 #include "webkit/tools/test_shell/simple_file_system.h"
37 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" 38 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
38 #include "webkit/user_agent/user_agent.h"
39 39
40 class TestShellHttpUserAgentSettings : public net::HttpUserAgentSettings { 40 class TestShellHttpUserAgentSettings : public net::HttpUserAgentSettings {
41 public: 41 public:
42 TestShellHttpUserAgentSettings() {} 42 TestShellHttpUserAgentSettings() {}
43 virtual ~TestShellHttpUserAgentSettings() {} 43 virtual ~TestShellHttpUserAgentSettings() {}
44 44
45 // Hard-code Accept-Language for test shells. 45 // Hard-code Accept-Language for test shells.
46 virtual std::string GetAcceptLanguage() const OVERRIDE { 46 virtual std::string GetAcceptLanguage() const OVERRIDE {
47 return "en-us,en"; 47 return "en-us,en";
48 } 48 }
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 job_factory->SetProtocolHandler( 132 job_factory->SetProtocolHandler(
133 "filesystem", 133 "filesystem",
134 fileapi::CreateFileSystemProtocolHandler(file_system_context_.get())); 134 fileapi::CreateFileSystemProtocolHandler(file_system_context_.get()));
135 job_factory->SetProtocolHandler("data", new net::DataProtocolHandler); 135 job_factory->SetProtocolHandler("data", new net::DataProtocolHandler);
136 job_factory->SetProtocolHandler("file", new net::FileProtocolHandler); 136 job_factory->SetProtocolHandler("file", new net::FileProtocolHandler);
137 storage_.set_job_factory(job_factory); 137 storage_.set_job_factory(job_factory);
138 } 138 }
139 139
140 TestShellRequestContext::~TestShellRequestContext() { 140 TestShellRequestContext::~TestShellRequestContext() {
141 } 141 }
OLDNEW
« no previous file with comments | « webkit/support/webkit_support.gyp ('k') | webkit/user_agent/user_agent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698