| 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 15 matching lines...) Expand all Loading... |
| 26 #include "base/win/registry.h" | 26 #include "base/win/registry.h" |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861 | 29 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861 |
| 30 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) | 30 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) |
| 31 #define MAYBE(x) DISABLED_##x | 31 #define MAYBE(x) DISABLED_##x |
| 32 #else | 32 #else |
| 33 #define MAYBE(x) x | 33 #define MAYBE(x) x |
| 34 #endif | 34 #endif |
| 35 | 35 |
| 36 using base::ASCIIToUTF16; |
| 37 |
| 36 namespace content { | 38 namespace content { |
| 37 namespace { | 39 namespace { |
| 38 | 40 |
| 39 void SetUrlRequestMock(const base::FilePath& path) { | 41 void SetUrlRequestMock(const base::FilePath& path) { |
| 40 URLRequestMockHTTPJob::AddUrlHandler(path); | 42 URLRequestMockHTTPJob::AddUrlHandler(path); |
| 41 } | 43 } |
| 42 | 44 |
| 43 } | 45 } |
| 44 | 46 |
| 45 class PluginTest : public ContentBrowserTest { | 47 class PluginTest : public ContentBrowserTest { |
| (...skipping 502 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 548 ResourceDispatcherHostDelegate* old_delegate = | 550 ResourceDispatcherHostDelegate* old_delegate = |
| 549 ResourceDispatcherHostImpl::Get()->delegate(); | 551 ResourceDispatcherHostImpl::Get()->delegate(); |
| 550 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); | 552 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); |
| 551 LoadAndWait(url); | 553 LoadAndWait(url); |
| 552 test_delegate.WaitForPluginRequest(); | 554 test_delegate.WaitForPluginRequest(); |
| 553 ASSERT_TRUE(test_delegate.found_cookie()); | 555 ASSERT_TRUE(test_delegate.found_cookie()); |
| 554 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); | 556 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); |
| 555 } | 557 } |
| 556 | 558 |
| 557 } // namespace content | 559 } // namespace content |
| OLD | NEW |