| OLD | NEW | 
|---|
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/file_path.h" | 5 #include "base/file_path.h" | 
| 6 #include "chrome/browser/browser.h" |  | 
| 7 #include "chrome/browser/browser_window.h" |  | 
| 8 #include "chrome/browser/defaults.h" | 6 #include "chrome/browser/defaults.h" | 
| 9 #include "chrome/browser/sessions/tab_restore_service.h" | 7 #include "chrome/browser/sessions/tab_restore_service.h" | 
| 10 #include "chrome/browser/tab_contents/tab_contents.h" | 8 #include "chrome/browser/tab_contents/tab_contents.h" | 
| 11 #include "chrome/browser/tabs/tab_strip_model.h" | 9 #include "chrome/browser/tabs/tab_strip_model.h" | 
|  | 10 #include "chrome/browser/ui/browser.h" | 
|  | 11 #include "chrome/browser/ui/browser_window.h" | 
| 12 #include "chrome/common/page_transition_types.h" | 12 #include "chrome/common/page_transition_types.h" | 
| 13 #include "chrome/test/in_process_browser_test.h" | 13 #include "chrome/test/in_process_browser_test.h" | 
| 14 #include "chrome/test/ui_test_utils.h" | 14 #include "chrome/test/ui_test_utils.h" | 
| 15 | 15 | 
| 16 typedef InProcessBrowserTest SessionRestoreTest; | 16 typedef InProcessBrowserTest SessionRestoreTest; | 
| 17 | 17 | 
| 18 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) | 18 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) | 
| 19 // Crashes on Linux Views: http://crbug.com/39476 | 19 // Crashes on Linux Views: http://crbug.com/39476 | 
| 20 #define MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers \ | 20 #define MAYBE_RestoreOnNewWindowWithNoTabbedBrowsers \ | 
| 21         DISABLED_RestoreOnNewWindowWithNoTabbedBrowsers | 21         DISABLED_RestoreOnNewWindowWithNoTabbedBrowsers | 
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 134   ASSERT_EQ(TabRestoreService::TAB, service->entries().front()->type); | 134   ASSERT_EQ(TabRestoreService::TAB, service->entries().front()->type); | 
| 135   const TabRestoreService::Tab* tab = | 135   const TabRestoreService::Tab* tab = | 
| 136       static_cast<TabRestoreService::Tab*>(service->entries().front()); | 136       static_cast<TabRestoreService::Tab*>(service->entries().front()); | 
| 137 | 137 | 
| 138   // Restore the tab. | 138   // Restore the tab. | 
| 139   service->RestoreEntryById(NULL, tab->id, false); | 139   service->RestoreEntryById(NULL, tab->id, false); | 
| 140 | 140 | 
| 141   // Make sure the restore was successful. | 141   // Make sure the restore was successful. | 
| 142   EXPECT_EQ(0U, service->entries().size()); | 142   EXPECT_EQ(0U, service->entries().size()); | 
| 143 } | 143 } | 
| OLD | NEW | 
|---|