| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
| 10 #if defined(OS_MACOSX) | 10 #if defined(OS_MACOSX) |
| (...skipping 1585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1596 GURL url = ui_test_utils::GetTestUrl( | 1596 GURL url = ui_test_utils::GetTestUrl( |
| 1597 FilePath(), FilePath().AppendASCII("title1.html")); | 1597 FilePath(), FilePath().AppendASCII("title1.html")); |
| 1598 command_line->AppendSwitchASCII(switches::kApp, url.spec()); | 1598 command_line->AppendSwitchASCII(switches::kApp, url.spec()); |
| 1599 } | 1599 } |
| 1600 }; | 1600 }; |
| 1601 | 1601 |
| 1602 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { | 1602 IN_PROC_BROWSER_TEST_F(AppModeTest, EnableAppModeTest) { |
| 1603 // Test that an application browser window loads correctly. | 1603 // Test that an application browser window loads correctly. |
| 1604 | 1604 |
| 1605 // Verify the browser is in application mode. | 1605 // Verify the browser is in application mode. |
| 1606 EXPECT_TRUE(browser()->IsApplication()); | 1606 EXPECT_TRUE(browser()->is_app()); |
| 1607 } | 1607 } |
| 1608 | 1608 |
| 1609 // Confirm about:version contains some expected content. | 1609 // Confirm about:version contains some expected content. |
| 1610 IN_PROC_BROWSER_TEST_F(BrowserTest, AboutVersion) { | 1610 IN_PROC_BROWSER_TEST_F(BrowserTest, AboutVersion) { |
| 1611 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutVersionURL)); | 1611 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kAboutVersionURL)); |
| 1612 TabContents* tab = chrome::GetActiveTabContents(browser()); | 1612 TabContents* tab = chrome::GetActiveTabContents(browser()); |
| 1613 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("WebKit"), true, true, | 1613 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("WebKit"), true, true, |
| 1614 NULL, NULL), | 1614 NULL, NULL), |
| 1615 0); | 1615 0); |
| 1616 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("OS"), true, true, | 1616 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("OS"), true, true, |
| 1617 NULL, NULL), | 1617 NULL, NULL), |
| 1618 0); | 1618 0); |
| 1619 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("JavaScript"), true, | 1619 ASSERT_GT(ui_test_utils::FindInPage(tab, ASCIIToUTF16("JavaScript"), true, |
| 1620 true, NULL, NULL), | 1620 true, NULL, NULL), |
| 1621 0); | 1621 0); |
| 1622 } | 1622 } |
| OLD | NEW |