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 "base/basictypes.h" | 5 #include "base/basictypes.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
10 #include "base/test/test_timeouts.h" | 10 #include "base/test/test_timeouts.h" |
11 #include "chrome/app/chrome_command_ids.h" | 11 #include "chrome/app/chrome_command_ids.h" |
12 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
13 #include "chrome/browser/sessions/tab_restore_service.h" | 13 #include "chrome/browser/sessions/tab_restore_service.h" |
14 #include "chrome/browser/sessions/tab_restore_service_factory.h" | 14 #include "chrome/browser/sessions/tab_restore_service_factory.h" |
15 #include "chrome/browser/sessions/tab_restore_service_observer.h" | 15 #include "chrome/browser/sessions/tab_restore_service_observer.h" |
16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_commands.h" | 17 #include "chrome/browser/ui/browser_commands.h" |
18 #include "chrome/browser/ui/browser_list.h" | 18 #include "chrome/browser/ui/browser_list.h" |
19 #include "chrome/browser/ui/browser_tabstrip.h" | 19 #include "chrome/browser/ui/browser_tabstrip.h" |
20 #include "chrome/browser/ui/find_bar/find_notification_details.h" | 20 #include "chrome/browser/ui/find_bar/find_notification_details.h" |
| 21 #include "chrome/browser/ui/host_desktop.h" |
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 22 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
22 #include "chrome/common/chrome_paths.h" | 23 #include "chrome/common/chrome_paths.h" |
23 #include "chrome/common/url_constants.h" | 24 #include "chrome/common/url_constants.h" |
24 #include "chrome/test/base/in_process_browser_test.h" | 25 #include "chrome/test/base/in_process_browser_test.h" |
25 #include "chrome/test/base/ui_test_utils.h" | 26 #include "chrome/test/base/ui_test_utils.h" |
26 #include "content/public/browser/navigation_controller.h" | 27 #include "content/public/browser/navigation_controller.h" |
27 #include "content/public/browser/notification_service.h" | 28 #include "content/public/browser/notification_service.h" |
28 #include "content/public/browser/notification_source.h" | 29 #include "content/public/browser/notification_source.h" |
29 #include "content/public/browser/notification_types.h" | 30 #include "content/public/browser/notification_types.h" |
30 #include "content/public/browser/page_navigator.h" | 31 #include "content/public/browser/page_navigator.h" |
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
626 while (browser()->tab_strip_model()->count()) | 627 while (browser()->tab_strip_model()->count()) |
627 CloseTab(0); | 628 CloseTab(0); |
628 } | 629 } |
629 | 630 |
630 // Verifies restoring a tab works on startup. | 631 // Verifies restoring a tab works on startup. |
631 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) { | 632 IN_PROC_BROWSER_TEST_F(TabRestoreTest, RestoreOnStartup) { |
632 ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1)); | 633 ASSERT_NO_FATAL_FAILURE(RestoreTab(0, 1)); |
633 EXPECT_EQ(url1_, | 634 EXPECT_EQ(url1_, |
634 browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL()); | 635 browser()->tab_strip_model()->GetWebContentsAt(1)->GetURL()); |
635 } | 636 } |
OLD | NEW |