| 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/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/macros.h" |
| 10 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 11 #include "base/values.h" | 12 #include "base/values.h" |
| 12 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 14 #include "chrome/common/chrome_paths.h" | 15 #include "chrome/common/chrome_paths.h" |
| 15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
| 16 #include "chrome/test/base/ui_test_utils.h" | 17 #include "chrome/test/base/ui_test_utils.h" |
| 17 #include "components/nacl/common/nacl_switches.h" | 18 #include "components/nacl/common/nacl_switches.h" |
| 18 #include "content/public/browser/plugin_service.h" | 19 #include "content/public/browser/plugin_service.h" |
| 19 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| (...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 // to point at the isolated the test extension directory. | 344 // to point at the isolated the test extension directory. |
| 344 // Otherwise, multiple NaCl extensions tests will end up sharing the | 345 // Otherwise, multiple NaCl extensions tests will end up sharing the |
| 345 // same directory when loading the extension files. | 346 // same directory when loading the extension files. |
| 346 base::FilePath document_root; | 347 base::FilePath document_root; |
| 347 ASSERT_TRUE(GetDocumentRoot(&document_root)); | 348 ASSERT_TRUE(GetDocumentRoot(&document_root)); |
| 348 | 349 |
| 349 // Document root is relative to source root, and source root may not be CWD. | 350 // Document root is relative to source root, and source root may not be CWD. |
| 350 command_line->AppendSwitchPath(switches::kLoadExtension, | 351 command_line->AppendSwitchPath(switches::kLoadExtension, |
| 351 src_root.Append(document_root)); | 352 src_root.Append(document_root)); |
| 352 } | 353 } |
| OLD | NEW |