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 "base/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "content/browser/loader/resource_dispatcher_host_impl.h" | 10 #include "content/browser/loader/resource_dispatcher_host_impl.h" |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 testing::UnitTest::GetInstance()->current_test_info(); | 57 testing::UnitTest::GetInstance()->current_test_info(); |
58 if (strcmp(test_info->name(), "MediaPlayerNew") == 0) { | 58 if (strcmp(test_info->name(), "MediaPlayerNew") == 0) { |
59 // The installer adds our process names to the registry key below. Since | 59 // The installer adds our process names to the registry key below. Since |
60 // the installer might not have run on this machine, add it manually. | 60 // the installer might not have run on this machine, add it manually. |
61 base::win::RegKey regkey; | 61 base::win::RegKey regkey; |
62 if (regkey.Open(HKEY_LOCAL_MACHINE, | 62 if (regkey.Open(HKEY_LOCAL_MACHINE, |
63 L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList", | 63 L"Software\\Microsoft\\MediaPlayer\\ShimInclusionList", |
64 KEY_WRITE) == ERROR_SUCCESS) { | 64 KEY_WRITE) == ERROR_SUCCESS) { |
65 regkey.CreateKey(L"BROWSER_TESTS.EXE", KEY_READ); | 65 regkey.CreateKey(L"BROWSER_TESTS.EXE", KEY_READ); |
66 } | 66 } |
67 } else if (strcmp(test_info->name(), "FlashSecurity") == 0) { | |
68 command_line->AppendSwitchASCII(switches::kTestSandbox, | |
69 "security_tests.dll"); | |
70 } | 67 } |
71 #elif defined(OS_MACOSX) | 68 #elif defined(OS_MACOSX) |
72 base::FilePath plugin_dir; | 69 base::FilePath plugin_dir; |
73 PathService::Get(base::DIR_MODULE, &plugin_dir); | 70 PathService::Get(base::DIR_MODULE, &plugin_dir); |
74 plugin_dir = plugin_dir.AppendASCII("plugins"); | 71 plugin_dir = plugin_dir.AppendASCII("plugins"); |
75 // The plugins directory isn't read by default on the Mac, so it needs to be | 72 // The plugins directory isn't read by default on the Mac, so it needs to be |
76 // explicitly registered. | 73 // explicitly registered. |
77 command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir); | 74 command_line->AppendSwitchPath(switches::kExtraPluginDir, plugin_dir); |
78 #endif | 75 #endif |
79 } | 76 } |
(...skipping 471 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
551 ResourceDispatcherHostDelegate* old_delegate = | 548 ResourceDispatcherHostDelegate* old_delegate = |
552 ResourceDispatcherHostImpl::Get()->delegate(); | 549 ResourceDispatcherHostImpl::Get()->delegate(); |
553 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); | 550 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); |
554 LoadAndWait(url); | 551 LoadAndWait(url); |
555 test_delegate.WaitForPluginRequest(); | 552 test_delegate.WaitForPluginRequest(); |
556 ASSERT_TRUE(test_delegate.found_cookie()); | 553 ASSERT_TRUE(test_delegate.found_cookie()); |
557 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); | 554 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); |
558 } | 555 } |
559 | 556 |
560 } // namespace content | 557 } // namespace content |
OLD | NEW |