OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 // windows headers | 8 // windows headers |
9 #include <comutil.h> | 9 #include <comutil.h> |
10 #include <shellapi.h> | 10 #include <shellapi.h> |
11 #include <shlobj.h> | 11 #include <shlobj.h> |
12 #include <windows.h> | 12 #include <windows.h> |
13 #endif | 13 #endif |
14 | 14 |
15 // runtime headers | 15 // runtime headers |
16 #include <memory.h> | 16 #include <memory.h> |
17 #include <stdlib.h> | 17 #include <stdlib.h> |
18 #include <string.h> | 18 #include <string.h> |
19 | 19 |
20 #include <ostream> | 20 #include <ostream> |
21 | 21 |
22 #include "base/file_path.h" | 22 #include "base/file_path.h" |
23 #include "base/string_number_conversions.h" | 23 #include "base/string_number_conversions.h" |
24 #include "base/test/test_timeouts.h" | 24 #include "base/test/test_timeouts.h" |
25 #include "chrome/browser/net/url_request_mock_http_job.h" | |
26 #include "chrome/common/chrome_paths.h" | 25 #include "chrome/common/chrome_paths.h" |
27 #include "chrome/common/url_constants.h" | 26 #include "chrome/common/url_constants.h" |
28 #include "chrome/test/automation/browser_proxy.h" | 27 #include "chrome/test/automation/browser_proxy.h" |
29 #include "chrome/test/automation/tab_proxy.h" | 28 #include "chrome/test/automation/tab_proxy.h" |
30 #include "chrome/test/automation/window_proxy.h" | 29 #include "chrome/test/automation/window_proxy.h" |
31 #include "chrome/test/ui/npapi_test_helper.h" | 30 #include "chrome/test/ui/npapi_test_helper.h" |
32 #include "chrome/test/ui_test_utils.h" | 31 #include "chrome/test/ui_test_utils.h" |
| 32 #include "content/browser/net/url_request_mock_http_job.h" |
33 | 33 |
34 using npapi_test::kTestCompleteCookie; | 34 using npapi_test::kTestCompleteCookie; |
35 using npapi_test::kTestCompleteSuccess; | 35 using npapi_test::kTestCompleteSuccess; |
36 | 36 |
37 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi"); | 37 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi"); |
38 | 38 |
39 namespace { | 39 namespace { |
40 | 40 |
41 class NPAPIAutomationEnabledTest : public NPAPIVisiblePluginTester { | 41 class NPAPIAutomationEnabledTest : public NPAPIVisiblePluginTester { |
42 public: | 42 public: |
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
467 ASSERT_TRUE(tab->LoadBlockedPlugins()); | 467 ASSERT_TRUE(tab->LoadBlockedPlugins()); |
468 | 468 |
469 WaitForFinish("setup", "1", url, kTestCompleteCookie, | 469 WaitForFinish("setup", "1", url, kTestCompleteCookie, |
470 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 470 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
471 | 471 |
472 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); | 472 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); |
473 | 473 |
474 WaitForFinish("setup", "2", url, kTestCompleteCookie, | 474 WaitForFinish("setup", "2", url, kTestCompleteCookie, |
475 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 475 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
476 } | 476 } |
OLD | NEW |