| 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" | |
| 6 | |
| 7 #include "base/test/test_timeouts.h" | 5 #include "base/test/test_timeouts.h" |
| 8 #include "chrome/browser/ui/browser.h" | 6 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/chrome_pages.h" | 7 #include "chrome/browser/ui/chrome_pages.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
| 12 #include "chrome/test/base/in_process_browser_test.h" | 10 #include "chrome/test/base/in_process_browser_test.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
| 14 #include "content/public/browser/notification_service.h" | 12 #include "content/public/browser/notification_service.h" |
| 15 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 16 #include "content/public/test/browser_test_utils.h" | 14 #include "content/public/test/browser_test_utils.h" |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 navigation_observer.Wait(); | 97 navigation_observer.Wait(); |
| 100 | 98 |
| 101 ASSERT_EQ(1, browser()->tab_strip_model()->count()); | 99 ASSERT_EQ(1, browser()->tab_strip_model()->count()); |
| 102 } | 100 } |
| 103 | 101 |
| 104 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) { | 102 IN_PROC_BROWSER_TEST_F(BookmarksTest, BookmarksLoaded) { |
| 105 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); | 103 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIBookmarksURL)); |
| 106 ASSERT_EQ(1, browser()->tab_strip_model()->count()); | 104 ASSERT_EQ(1, browser()->tab_strip_model()->count()); |
| 107 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); | 105 AssertIsBookmarksPage(browser()->tab_strip_model()->GetActiveWebContents()); |
| 108 } | 106 } |
| OLD | NEW |