| 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 #include <comutil.h> | 8 #include <comutil.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #include <shlobj.h> | 10 #include <shlobj.h> |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "base/test/test_timeouts.h" | 22 #include "base/test/test_timeouts.h" |
| 23 #include "chrome/common/chrome_paths.h" | 23 #include "chrome/common/chrome_paths.h" |
| 24 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
| 25 #include "chrome/test/automation/automation_proxy.h" | 25 #include "chrome/test/automation/automation_proxy.h" |
| 26 #include "chrome/test/automation/browser_proxy.h" | 26 #include "chrome/test/automation/browser_proxy.h" |
| 27 #include "chrome/test/automation/tab_proxy.h" | 27 #include "chrome/test/automation/tab_proxy.h" |
| 28 #include "chrome/test/automation/window_proxy.h" | 28 #include "chrome/test/automation/window_proxy.h" |
| 29 #include "chrome/test/base/ui_test_utils.h" | 29 #include "chrome/test/base/ui_test_utils.h" |
| 30 #include "chrome/test/ui/npapi_test_helper.h" | 30 #include "chrome/test/ui/npapi_test_helper.h" |
| 31 #include "content/browser/net/url_request_mock_http_job.h" | 31 #include "content/browser/net/url_request_mock_http_job.h" |
| 32 #include "content/common/content_switches.h" | 32 #include "content/public/common/content_switches.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 namespace { | 37 namespace { |
| 38 | 38 |
| 39 const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi"); | 39 const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("npapi"); |
| 40 | 40 |
| 41 class NPAPIAutomationEnabledTest : public NPAPIVisiblePluginTester { | 41 class NPAPIAutomationEnabledTest : public NPAPIVisiblePluginTester { |
| 42 public: | 42 public: |
| (...skipping 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 ASSERT_TRUE(tab->LoadBlockedPlugins()); | 444 ASSERT_TRUE(tab->LoadBlockedPlugins()); |
| 445 | 445 |
| 446 WaitForFinish("setup", "1", url, kTestCompleteCookie, | 446 WaitForFinish("setup", "1", url, kTestCompleteCookie, |
| 447 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 447 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
| 448 | 448 |
| 449 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); | 449 ASSERT_TRUE(tab->ExecuteJavaScript("window.inject()")); |
| 450 | 450 |
| 451 WaitForFinish("setup", "2", url, kTestCompleteCookie, | 451 WaitForFinish("setup", "2", url, kTestCompleteCookie, |
| 452 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); | 452 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); |
| 453 } | 453 } |
| OLD | NEW |