OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "content/test/test_blink_web_unit_test_support.h" | 5 #include "content/test/test_blink_web_unit_test_support.h" |
6 | 6 |
7 #include "base/feature_list.h" | 7 #include "base/feature_list.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/files/scoped_temp_dir.h" | 10 #include "base/files/scoped_temp_dir.h" |
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
280 return url_loader_factory_.get(); | 280 return url_loader_factory_.get(); |
281 } | 281 } |
282 | 282 |
283 blink::WebThread* TestBlinkWebUnitTestSupport::currentThread() { | 283 blink::WebThread* TestBlinkWebUnitTestSupport::currentThread() { |
284 if (web_thread_ && web_thread_->isCurrentThread()) | 284 if (web_thread_ && web_thread_->isCurrentThread()) |
285 return web_thread_.get(); | 285 return web_thread_.get(); |
286 return BlinkPlatformImpl::currentThread(); | 286 return BlinkPlatformImpl::currentThread(); |
287 } | 287 } |
288 | 288 |
289 void TestBlinkWebUnitTestSupport::getPluginList( | 289 void TestBlinkWebUnitTestSupport::getPluginList( |
290 bool refresh, blink::WebPluginListBuilder* builder) { | 290 bool refresh, |
| 291 const blink::WebSecurityOrigin& mainFrameOrigin, |
| 292 blink::WebPluginListBuilder* builder) { |
291 builder->addPlugin("pdf", "pdf", "pdf-files"); | 293 builder->addPlugin("pdf", "pdf", "pdf-files"); |
292 builder->addMediaTypeToLastPlugin("application/pdf", "pdf"); | 294 builder->addMediaTypeToLastPlugin("application/pdf", "pdf"); |
293 } | 295 } |
294 | 296 |
295 } // namespace content | 297 } // namespace content |
OLD | NEW |