| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "ash/first_run/first_run_helper.h" | 5 #include "ash/first_run/first_run_helper.h" |
| 6 #include "ash/shell.h" | 6 #include "ash/shell.h" |
| 7 #include "ash/system/tray/system_tray.h" | 7 #include "ash/system/tray/system_tray.h" |
| 8 #include "chrome/browser/chromeos/first_run/first_run.h" | 8 #include "chrome/browser/chromeos/first_run/first_run.h" |
| 9 #include "chrome/browser/chromeos/first_run/first_run_controller.h" | 9 #include "chrome/browser/chromeos/first_run/first_run_controller.h" |
| 10 #include "chrome/browser/chromeos/first_run/step_names.h" | 10 #include "chrome/browser/chromeos/first_run/step_names.h" |
| (...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 | 119 |
| 120 private: | 120 private: |
| 121 bool initialized_; | 121 bool initialized_; |
| 122 bool finalized_; | 122 bool finalized_; |
| 123 base::Closure on_initialized_callback_; | 123 base::Closure on_initialized_callback_; |
| 124 base::Closure on_step_shown_callback_; | 124 base::Closure on_step_shown_callback_; |
| 125 base::Closure on_finalized_callback_; | 125 base::Closure on_finalized_callback_; |
| 126 test::JSChecker js_; | 126 test::JSChecker js_; |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 IN_PROC_BROWSER_TEST_F(FirstRunUIBrowserTest, FirstRunFlow) { | 129 // Disabled due to flakiness, see http://crbug.com/335280 |
| 130 IN_PROC_BROWSER_TEST_F(FirstRunUIBrowserTest, DISABLED_FirstRunFlow) { |
| 130 LaunchTutorial(); | 131 LaunchTutorial(); |
| 131 WaitForInitialization(); | 132 WaitForInitialization(); |
| 132 WaitForStep(first_run::kAppListStep); | 133 WaitForStep(first_run::kAppListStep); |
| 133 EXPECT_FALSE(shell_helper()->IsTrayBubbleOpened()); | 134 EXPECT_FALSE(shell_helper()->IsTrayBubbleOpened()); |
| 134 AdvanceStep(); | 135 AdvanceStep(); |
| 135 WaitForStep(first_run::kTrayStep); | 136 WaitForStep(first_run::kTrayStep); |
| 136 EXPECT_TRUE(shell_helper()->IsTrayBubbleOpened()); | 137 EXPECT_TRUE(shell_helper()->IsTrayBubbleOpened()); |
| 137 AdvanceStep(); | 138 AdvanceStep(); |
| 138 WaitForStep(first_run::kHelpStep); | 139 WaitForStep(first_run::kHelpStep); |
| 139 EXPECT_TRUE(shell_helper()->IsTrayBubbleOpened()); | 140 EXPECT_TRUE(shell_helper()->IsTrayBubbleOpened()); |
| 140 AdvanceStep(); | 141 AdvanceStep(); |
| 141 WaitForFinalization(); | 142 WaitForFinalization(); |
| 142 content::RunAllPendingInMessageLoop(); | 143 content::RunAllPendingInMessageLoop(); |
| 143 EXPECT_EQ(controller(), (void*)NULL); | 144 EXPECT_EQ(controller(), (void*)NULL); |
| 144 // shell_helper() is destructed already, thats why we call Shell directly. | 145 // shell_helper() is destructed already, thats why we call Shell directly. |
| 145 EXPECT_FALSE(ash::Shell::GetInstance()->GetPrimarySystemTray()-> | 146 EXPECT_FALSE(ash::Shell::GetInstance()->GetPrimarySystemTray()-> |
| 146 HasSystemBubble()); | 147 HasSystemBubble()); |
| 147 } | 148 } |
| 148 | 149 |
| 149 } // namespace chromeos | 150 } // namespace chromeos |
| 150 | 151 |
| OLD | NEW |