| 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 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 285 return url_loader_factory_.get(); | 285 return url_loader_factory_.get(); |
| 286 } | 286 } |
| 287 | 287 |
| 288 blink::WebThread* TestBlinkWebUnitTestSupport::currentThread() { | 288 blink::WebThread* TestBlinkWebUnitTestSupport::currentThread() { |
| 289 if (web_thread_ && web_thread_->isCurrentThread()) | 289 if (web_thread_ && web_thread_->isCurrentThread()) |
| 290 return web_thread_.get(); | 290 return web_thread_.get(); |
| 291 return BlinkPlatformImpl::currentThread(); | 291 return BlinkPlatformImpl::currentThread(); |
| 292 } | 292 } |
| 293 | 293 |
| 294 void TestBlinkWebUnitTestSupport::getPluginList( | 294 void TestBlinkWebUnitTestSupport::getPluginList( |
| 295 bool refresh, blink::WebPluginListBuilder* builder) { | 295 bool refresh, |
| 296 blink::WebSecurityOrigin* origin, |
| 297 blink::WebPluginListBuilder* builder) { |
| 296 builder->addPlugin("pdf", "pdf", "pdf-files"); | 298 builder->addPlugin("pdf", "pdf", "pdf-files"); |
| 297 builder->addMediaTypeToLastPlugin("application/pdf", "pdf"); | 299 builder->addMediaTypeToLastPlugin("application/pdf", "pdf"); |
| 298 } | 300 } |
| 299 | 301 |
| 300 } // namespace content | 302 } // namespace content |
| OLD | NEW |