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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/scoped_ptr.h" | 7 #include "base/scoped_ptr.h" |
8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
10 #include "chrome/common/chrome_paths.h" | 10 #include "chrome/common/chrome_paths.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 } | 77 } |
78 | 78 |
79 GURL url1_; | 79 GURL url1_; |
80 GURL url2_; | 80 GURL url2_; |
81 GURL url3_; | 81 GURL url3_; |
82 | 82 |
83 private: | 83 private: |
84 DISALLOW_COPY_AND_ASSIGN(SessionRestoreUITest); | 84 DISALLOW_COPY_AND_ASSIGN(SessionRestoreUITest); |
85 }; | 85 }; |
86 | 86 |
87 } // namespace | |
88 | |
89 TEST_F(SessionRestoreUITest, Basic) { | 87 TEST_F(SessionRestoreUITest, Basic) { |
90 NavigateToURL(url1_); | 88 NavigateToURL(url1_); |
91 NavigateToURL(url2_); | 89 NavigateToURL(url2_); |
92 | 90 |
93 QuitBrowserAndRestore(1); | 91 QuitBrowserAndRestore(1); |
94 | 92 |
95 // NOTE: Don't use GetActiveWindow here, when run with the screen locked | 93 // NOTE: Don't use GetActiveWindow here, when run with the screen locked |
96 // active windows returns NULL. | 94 // active windows returns NULL. |
97 int window_count; | 95 int window_count; |
98 ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) && | 96 ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) && |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
407 scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(tab_count - 2)); | 405 scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(tab_count - 2)); |
408 ASSERT_TRUE(tab_proxy.get() != NULL); | 406 ASSERT_TRUE(tab_proxy.get() != NULL); |
409 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); | 407 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); |
410 tab_proxy = browser_proxy->GetTab(tab_count - 1); | 408 tab_proxy = browser_proxy->GetTab(tab_count - 1); |
411 ASSERT_TRUE(tab_proxy.get() != NULL); | 409 ASSERT_TRUE(tab_proxy.get() != NULL); |
412 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); | 410 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms())); |
413 | 411 |
414 ASSERT_EQ(expected_process_count, GetBrowserProcessCount()); | 412 ASSERT_EQ(expected_process_count, GetBrowserProcessCount()); |
415 } | 413 } |
416 #endif | 414 #endif |
| 415 |
| 416 } // namespace |
OLD | NEW |