| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
| 10 #include "chrome/browser/defaults.h" | 10 #include "chrome/browser/defaults.h" |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(0)); | 371 scoped_refptr<TabProxy> tab_proxy(browser_proxy->GetTab(0)); |
| 372 ASSERT_TRUE(tab_proxy.get()); | 372 ASSERT_TRUE(tab_proxy.get()); |
| 373 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); | 373 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); |
| 374 GURL url; | 374 GURL url; |
| 375 ASSERT_TRUE(tab_proxy->GetCurrentURL(&url)); | 375 ASSERT_TRUE(tab_proxy->GetCurrentURL(&url)); |
| 376 ASSERT_TRUE(url != url1_); | 376 ASSERT_TRUE(url != url1_); |
| 377 } | 377 } |
| 378 | 378 |
| 379 // Launches an app window, closes tabbed browser, launches and makes sure | 379 // Launches an app window, closes tabbed browser, launches and makes sure |
| 380 // we restore the tabbed browser url. | 380 // we restore the tabbed browser url. |
| 381 // Flaky: http://crbug.com/29110 |
| 381 TEST_F(SessionRestoreUITest, | 382 TEST_F(SessionRestoreUITest, |
| 382 FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) { | 383 FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching) { |
| 383 NavigateToURL(url1_); | 384 NavigateToURL(url1_); |
| 384 | 385 |
| 385 // Launch an app. | 386 // Launch an app. |
| 386 | 387 |
| 387 bool include_testing_id_orig = include_testing_id_; | 388 bool include_testing_id_orig = include_testing_id_; |
| 388 include_testing_id_ = false; | 389 include_testing_id_ = false; |
| 389 clear_profile_ = false; | 390 clear_profile_ = false; |
| 390 CommandLine app_launch_arguments = launch_arguments_; | 391 CommandLine app_launch_arguments = launch_arguments_; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 ASSERT_TRUE(tab_proxy.get() != NULL); | 479 ASSERT_TRUE(tab_proxy.get() != NULL); |
| 479 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); | 480 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); |
| 480 tab_proxy = browser_proxy->GetTab(tab_count - 1); | 481 tab_proxy = browser_proxy->GetTab(tab_count - 1); |
| 481 ASSERT_TRUE(tab_proxy.get() != NULL); | 482 ASSERT_TRUE(tab_proxy.get() != NULL); |
| 482 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); | 483 ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_max_timeout_ms())); |
| 483 | 484 |
| 484 ASSERT_EQ(expected_process_count, GetBrowserProcessCount()); | 485 ASSERT_EQ(expected_process_count, GetBrowserProcessCount()); |
| 485 } | 486 } |
| 486 | 487 |
| 487 } // namespace | 488 } // namespace |
| OLD | NEW |