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 <stdlib.h> | 7 #include <stdlib.h> |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/json/json_reader.h" | 10 #include "base/json/json_reader.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
15 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
17 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
18 #include "content/public/browser/plugin_service.h" | 18 #include "content/public/browser/plugin_service.h" |
19 #include "content/public/browser/web_contents.h" | 19 #include "content/public/browser/web_contents.h" |
| 20 #include "content/public/common/webplugininfo.h" |
20 #include "net/base/net_util.h" | 21 #include "net/base/net_util.h" |
21 #include "webkit/plugins/webplugininfo.h" | |
22 | 22 |
23 typedef TestMessageHandler::MessageResponse MessageResponse; | 23 typedef TestMessageHandler::MessageResponse MessageResponse; |
24 | 24 |
25 MessageResponse StructuredMessageHandler::HandleMessage( | 25 MessageResponse StructuredMessageHandler::HandleMessage( |
26 const std::string& json) { | 26 const std::string& json) { |
27 scoped_ptr<Value> value; | 27 scoped_ptr<Value> value; |
28 base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS); | 28 base::JSONReader reader(base::JSON_ALLOW_TRAILING_COMMAS); |
29 // Automation messages are stringified before they are sent because the | 29 // Automation messages are stringified before they are sent because the |
30 // automation channel cannot handle arbitrary objects. This means we | 30 // automation channel cannot handle arbitrary objects. This means we |
31 // need to decode the json twice to get the original message. | 31 // need to decode the json twice to get the original message. |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
294 } | 294 } |
295 | 295 |
296 base::FilePath::StringType NaClBrowserTestStatic::Variant() { | 296 base::FilePath::StringType NaClBrowserTestStatic::Variant() { |
297 return FILE_PATH_LITERAL("static"); | 297 return FILE_PATH_LITERAL("static"); |
298 } | 298 } |
299 | 299 |
300 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { | 300 bool NaClBrowserTestStatic::GetDocumentRoot(base::FilePath* document_root) { |
301 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); | 301 *document_root = base::FilePath(FILE_PATH_LITERAL("chrome/test/data/nacl")); |
302 return true; | 302 return true; |
303 } | 303 } |
OLD | NEW |