OLD | NEW |
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 "chrome/test/nacl/nacl_browsertest_util.h" | 5 #include "chrome/test/nacl/nacl_browsertest_util.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 12 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
13 #include "chrome/common/chrome_paths.h" | 13 #include "chrome/common/chrome_paths.h" |
14 #include "chrome/common/chrome_switches.h" | 14 #include "chrome/common/chrome_switches.h" |
| 15 #include "chrome/nacl/nacl_switches.h" |
15 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
16 #include "content/public/browser/plugin_service.h" | 17 #include "content/public/browser/plugin_service.h" |
17 #include "content/public/browser/web_contents.h" | 18 #include "content/public/browser/web_contents.h" |
18 #include "net/base/net_util.h" | 19 #include "net/base/net_util.h" |
19 #include "webkit/plugins/webplugininfo.h" | 20 #include "webkit/plugins/webplugininfo.h" |
20 | 21 |
21 | 22 |
22 typedef TestMessageHandler::MessageResponse MessageResponse; | 23 typedef TestMessageHandler::MessageResponse MessageResponse; |
23 | 24 |
24 MessageResponse StructuredMessageHandler::HandleMessage( | 25 MessageResponse StructuredMessageHandler::HandleMessage( |
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 } | 272 } |
272 | 273 |
273 base::FilePath::StringType NaClBrowserTestStatic::Variant() { | 274 base::FilePath::StringType NaClBrowserTestStatic::Variant() { |
274 return FILE_PATH_LITERAL("static"); | 275 return FILE_PATH_LITERAL("static"); |
275 } | 276 } |
276 | 277 |
277 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { | 278 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { |
278 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); | 279 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); |
279 return true; | 280 return true; |
280 } | 281 } |
OLD | NEW |