| 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 "content/public/test/content_browser_test.h" | 5 #include "content/public/test/content_browser_test.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "content/public/common/content_switches.h" | 9 #include "content/public/common/content_switches.h" |
| 10 #include "content/public/test/browser_test_utils.h" | 10 #include "content/public/test/browser_test_utils.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 NavigateToURL(shell(), url); | 36 NavigateToURL(shell(), url); |
| 37 base::string16 title = title_watcher.WaitAndGetTitle(); | 37 base::string16 title = title_watcher.WaitAndGetTitle(); |
| 38 EXPECT_EQ(expected_title, title); | 38 EXPECT_EQ(expected_title, title); |
| 39 } | 39 } |
| 40 }; | 40 }; |
| 41 | 41 |
| 42 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, Basic) { | 42 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, Basic) { |
| 43 Test(); | 43 Test(); |
| 44 } | 44 } |
| 45 | 45 |
| 46 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, SingleProcess) { | 46 #if defined(OS_MACOSX) |
| 47 // This is failing on Mac ASan: http://crbug.com/394775 |
| 48 #define MAYBE_SingleProcess DISABLED_SingleProcess |
| 49 #else |
| 50 #define MAYBE_SingleProcess SingleProcess |
| 51 #endif |
| 52 IN_PROC_BROWSER_TEST_F(ContentBrowserTestSanityTest, MAYBE_SingleProcess) { |
| 47 Test(); | 53 Test(); |
| 48 } | 54 } |
| 49 | 55 |
| 50 } // namespace content | 56 } // namespace content |
| OLD | NEW |