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

Side by Side Diff: components/test_runner/test_interfaces.cc

Issue 2675303004: Move WebCache from public/web into public/platform (Closed)
Patch Set: . Created 3 years, 10 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
« no previous file with comments | « chrome/renderer/net_benchmarking_extension.cc ('k') | components/web_cache/renderer/DEPS » ('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 "components/test_runner/test_interfaces.h" 5 #include "components/test_runner/test_interfaces.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/json/json_writer.h" 11 #include "base/json/json_writer.h"
12 #include "base/json/string_escape.h" 12 #include "base/json/string_escape.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/strings/stringprintf.h" 14 #include "base/strings/stringprintf.h"
15 #include "base/values.h" 15 #include "base/values.h"
16 #include "components/test_runner/gamepad_controller.h" 16 #include "components/test_runner/gamepad_controller.h"
17 #include "components/test_runner/gc_controller.h" 17 #include "components/test_runner/gc_controller.h"
18 #include "components/test_runner/test_runner.h" 18 #include "components/test_runner/test_runner.h"
19 #include "components/test_runner/text_input_controller.h" 19 #include "components/test_runner/text_input_controller.h"
20 #include "components/test_runner/web_view_test_proxy.h" 20 #include "components/test_runner/web_view_test_proxy.h"
21 #include "third_party/WebKit/public/platform/WebCache.h"
21 #include "third_party/WebKit/public/platform/WebURL.h" 22 #include "third_party/WebKit/public/platform/WebURL.h"
22 #include "third_party/WebKit/public/web/WebCache.h"
23 #include "third_party/WebKit/public/web/WebKit.h" 23 #include "third_party/WebKit/public/web/WebKit.h"
24 #include "third_party/WebKit/public/web/WebView.h" 24 #include "third_party/WebKit/public/web/WebView.h"
25 25
26 namespace test_runner { 26 namespace test_runner {
27 27
28 TestInterfaces::TestInterfaces() 28 TestInterfaces::TestInterfaces()
29 : test_runner_(new TestRunner(this)), 29 : test_runner_(new TestRunner(this)),
30 delegate_(nullptr), 30 delegate_(nullptr),
31 main_view_(nullptr) { 31 main_view_(nullptr) {
32 blink::setLayoutTestMode(true); 32 blink::setLayoutTestMode(true);
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() { 153 blink::WebThemeEngine* TestInterfaces::GetThemeEngine() {
154 if (!test_runner_->UseMockTheme()) 154 if (!test_runner_->UseMockTheme())
155 return 0; 155 return 0;
156 if (!theme_engine_.get()) 156 if (!theme_engine_.get())
157 theme_engine_.reset(new MockWebThemeEngine()); 157 theme_engine_.reset(new MockWebThemeEngine());
158 return theme_engine_.get(); 158 return theme_engine_.get();
159 } 159 }
160 160
161 } // namespace test_runner 161 } // namespace test_runner
OLDNEW
« no previous file with comments | « chrome/renderer/net_benchmarking_extension.cc ('k') | components/web_cache/renderer/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698