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

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

Issue 10869073: Split user agent code out of the 'glue' target (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to trunk Created 8 years, 3 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/tools/test_shell/test_shell.gypi ('k') | webkit/tools/test_shell/test_shell_test.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 (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/file_path.h" 10 #include "base/file_path.h"
(...skipping 12 matching lines...) Expand all
23 #include "net/proxy/proxy_config_service.h" 23 #include "net/proxy/proxy_config_service.h"
24 #include "net/proxy/proxy_config_service_fixed.h" 24 #include "net/proxy/proxy_config_service_fixed.h"
25 #include "net/proxy/proxy_service.h" 25 #include "net/proxy/proxy_service.h"
26 #include "net/url_request/url_request_job_factory_impl.h" 26 #include "net/url_request/url_request_job_factory_impl.h"
27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" 27 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
28 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h" 28 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h"
29 #include "webkit/blob/blob_storage_controller.h" 29 #include "webkit/blob/blob_storage_controller.h"
30 #include "webkit/blob/blob_url_request_job_factory.h" 30 #include "webkit/blob/blob_url_request_job_factory.h"
31 #include "webkit/fileapi/file_system_context.h" 31 #include "webkit/fileapi/file_system_context.h"
32 #include "webkit/fileapi/file_system_url_request_job_factory.h" 32 #include "webkit/fileapi/file_system_url_request_job_factory.h"
33 #include "webkit/glue/webkit_glue.h"
34 #include "webkit/tools/test_shell/simple_file_system.h" 33 #include "webkit/tools/test_shell/simple_file_system.h"
35 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h" 34 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
35 #include "webkit/user_agent/user_agent.h"
36 36
37 TestShellRequestContext::TestShellRequestContext() 37 TestShellRequestContext::TestShellRequestContext()
38 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) { 38 : ALLOW_THIS_IN_INITIALIZER_LIST(storage_(this)) {
39 Init(FilePath(), net::HttpCache::NORMAL, false); 39 Init(FilePath(), net::HttpCache::NORMAL, false);
40 } 40 }
41 41
42 TestShellRequestContext::TestShellRequestContext( 42 TestShellRequestContext::TestShellRequestContext(
43 const FilePath& cache_path, 43 const FilePath& cache_path,
44 net::HttpCache::Mode cache_mode, 44 net::HttpCache::Mode cache_mode,
45 bool no_proxy) 45 bool no_proxy)
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 storage_.set_job_factory(job_factory); 132 storage_.set_job_factory(job_factory);
133 } 133 }
134 134
135 TestShellRequestContext::~TestShellRequestContext() { 135 TestShellRequestContext::~TestShellRequestContext() {
136 } 136 }
137 137
138 const std::string& TestShellRequestContext::GetUserAgent( 138 const std::string& TestShellRequestContext::GetUserAgent(
139 const GURL& url) const { 139 const GURL& url) const {
140 return webkit_glue::GetUserAgent(url); 140 return webkit_glue::GetUserAgent(url);
141 } 141 }
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.gypi ('k') | webkit/tools/test_shell/test_shell_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698