| 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 <list> | 5 #include <list> |
| 6 #include <set> | 6 #include <set> |
| 7 | 7 |
| 8 #include "base/memory/ref_counted.h" | 8 #include "base/memory/ref_counted.h" |
| 9 #include "base/memory/weak_ptr.h" | 9 #include "base/memory/weak_ptr.h" |
| 10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
| (...skipping 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 content::ContentBrowserClient* original_content_browser_client_; | 378 content::ContentBrowserClient* original_content_browser_client_; |
| 379 | 379 |
| 380 DISALLOW_COPY_AND_ASSIGN(WebNavigationApiTest); | 380 DISALLOW_COPY_AND_ASSIGN(WebNavigationApiTest); |
| 381 }; | 381 }; |
| 382 | 382 |
| 383 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) { | 383 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, Api) { |
| 384 ASSERT_TRUE( | 384 ASSERT_TRUE( |
| 385 RunExtensionSubtest("webnavigation", "test_api.html")) << message_; | 385 RunExtensionSubtest("webnavigation", "test_api.html")) << message_; |
| 386 } | 386 } |
| 387 | 387 |
| 388 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, GetFrame) { | 388 // http://crbug.com/238737 |
| 389 #if defined(OS_WIN) |
| 390 #define MAYBE_GetFrame DISABLED_GetFrame |
| 391 #else |
| 392 #define MAYBE_GetFrame GetFrame |
| 393 #endif |
| 394 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, MAYBE_GetFrame) { |
| 389 ASSERT_TRUE( | 395 ASSERT_TRUE( |
| 390 RunExtensionSubtest("webnavigation", "test_getFrame.html")) << message_; | 396 RunExtensionSubtest("webnavigation", "test_getFrame.html")) << message_; |
| 391 } | 397 } |
| 392 | 398 |
| 393 // http://crbug.com/238737 | 399 // http://crbug.com/238737 |
| 394 #if defined(OS_WIN) | 400 #if defined(OS_WIN) |
| 395 #define MAYBE_ClientRedirect DISABLED_ClientRedirect | 401 #define MAYBE_ClientRedirect DISABLED_ClientRedirect |
| 396 #else | 402 #else |
| 397 #define MAYBE_ClientRedirect ClientRedirect | 403 #define MAYBE_ClientRedirect ClientRedirect |
| 398 #endif | 404 #endif |
| (...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 818 url = GURL(base::StringPrintf( | 824 url = GURL(base::StringPrintf( |
| 819 "http://www.a.com:%d/" | 825 "http://www.a.com:%d/" |
| 820 "files/extensions/api_test/webnavigation/crash/b.html", | 826 "files/extensions/api_test/webnavigation/crash/b.html", |
| 821 test_server()->host_port_pair().port())); | 827 test_server()->host_port_pair().port())); |
| 822 ui_test_utils::NavigateToURL(browser(), url); | 828 ui_test_utils::NavigateToURL(browser(), url); |
| 823 | 829 |
| 824 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); | 830 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 825 } | 831 } |
| 826 | 832 |
| 827 } // namespace extensions | 833 } // namespace extensions |
| OLD | NEW |