| 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 "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
| 6 | 6 |
| 7 #include "base/test/test_timeouts.h" | 7 #include "base/test/test_timeouts.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/chrome_pages.h" | 9 #include "chrome/browser/ui/chrome_pages.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 | 26 |
| 27 // Bring up the bookmarks manager tab. | 27 // Bring up the bookmarks manager tab. |
| 28 chrome::ShowBookmarkManager(browser()); | 28 chrome::ShowBookmarkManager(browser()); |
| 29 navigation_observer.Wait(); | 29 navigation_observer.Wait(); |
| 30 } | 30 } |
| 31 | 31 |
| 32 void AssertIsBookmarksPage(content::WebContents* tab) { | 32 void AssertIsBookmarksPage(content::WebContents* tab) { |
| 33 GURL url; | 33 GURL url; |
| 34 std::string out; | 34 std::string out; |
| 35 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( | 35 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( |
| 36 tab->GetRenderViewHost(), | 36 tab->GetRenderViewHost(), L"", |
| 37 "", | 37 L"domAutomationController.send(location.protocol)", &out)); |
| 38 "domAutomationController.send(location.protocol)", | |
| 39 &out)); | |
| 40 ASSERT_EQ("chrome-extension:", out); | 38 ASSERT_EQ("chrome-extension:", out); |
| 41 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( | 39 ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString( |
| 42 tab->GetRenderViewHost(), | 40 tab->GetRenderViewHost(), L"", |
| 43 "", | 41 L"domAutomationController.send(location.pathname)", &out)); |
| 44 "domAutomationController.send(location.pathname)", | |
| 45 &out)); | |
| 46 ASSERT_EQ("/main.html", out); | 42 ASSERT_EQ("/main.html", out); |
| 47 } | 43 } |
| 48 }; | 44 }; |
| 49 | 45 |
| 50 IN_PROC_BROWSER_TEST_F(BookmarksTest, ShouldRedirectToExtension) { | 46 IN_PROC_BROWSER_TEST_F(BookmarksTest, ShouldRedirectToExtension) { |
| 51 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); | 47 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); |
| 52 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); | 48 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); |
| 53 } | 49 } |
| 54 | 50 |
| 55 IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) { | 51 IN_PROC_BROWSER_TEST_F(BookmarksTest, CommandOpensBookmarksTab) { |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 navigation_observer.Wait(); | 88 navigation_observer.Wait(); |
| 93 | 89 |
| 94 ASSERT_EQ(1, browser()->tab_count()); | 90 ASSERT_EQ(1, browser()->tab_count()); |
| 95 } | 91 } |
| 96 | 92 |
| 97 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) { | 93 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) { |
| 98 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); | 94 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); |
| 99 ASSERT_EQ(1, browser()->tab_strip_model()->count()); | 95 ASSERT_EQ(1, browser()->tab_strip_model()->count()); |
| 100 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); | 96 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); |
| 101 } | 97 } |
| OLD | NEW |