Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(64)

Side by Side Diff: chrome/browser/chromeos/login/screens/network_screen_browsertest.cc

Issue 83633004: Do not spawn a thread in browser/interactive ui tests before spawning sandbox host process (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/memory/scoped_ptr.h" 5 #include "base/memory/scoped_ptr.h"
6 #include "chrome/browser/chromeos/login/helper.h" 6 #include "chrome/browser/chromeos/login/helper.h"
7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
8 #include "chrome/browser/chromeos/login/screens/network_screen.h" 8 #include "chrome/browser/chromeos/login/screens/network_screen.h"
9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" 9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 51
52 protected: 52 protected:
53 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 53 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
54 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); 54 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture();
55 55
56 FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager; 56 FakeDBusThreadManager* fake_dbus_thread_manager = new FakeDBusThreadManager;
57 fake_dbus_thread_manager->SetFakeClients(); 57 fake_dbus_thread_manager->SetFakeClients();
58 fake_session_manager_client_ = new FakeSessionManagerClient; 58 fake_session_manager_client_ = new FakeSessionManagerClient;
59 fake_dbus_thread_manager->SetSessionManagerClient( 59 fake_dbus_thread_manager->SetSessionManagerClient(
60 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); 60 scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
61 DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); 61 DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
62 } 62 }
63 63
64 virtual void SetUpOnMainThread() OVERRIDE { 64 virtual void SetUpOnMainThread() OVERRIDE {
65 WizardInProcessBrowserTest::SetUpOnMainThread(); 65 WizardInProcessBrowserTest::SetUpOnMainThread();
66 mock_screen_observer_.reset(new MockScreenObserver()); 66 mock_screen_observer_.reset(new MockScreenObserver());
67 ASSERT_TRUE(WizardController::default_controller() != NULL); 67 ASSERT_TRUE(WizardController::default_controller() != NULL);
68 network_screen_ = 68 network_screen_ =
69 WizardController::default_controller()->GetNetworkScreen(); 69 WizardController::default_controller()->GetNetworkScreen();
70 ASSERT_TRUE(network_screen_ != NULL); 70 ASSERT_TRUE(network_screen_ != NULL);
71 ASSERT_EQ(WizardController::default_controller()->current_screen(), 71 ASSERT_EQ(WizardController::default_controller()->current_screen(),
72 network_screen_); 72 network_screen_);
73 network_screen_->screen_observer_ = mock_screen_observer_.get(); 73 network_screen_->screen_observer_ = mock_screen_observer_.get();
74 ASSERT_TRUE(network_screen_->actor() != NULL); 74 ASSERT_TRUE(network_screen_->actor() != NULL);
75 75
76 mock_network_state_helper_ = new login::MockNetworkStateHelper; 76 mock_network_state_helper_ = new login::MockNetworkStateHelper;
77 SetDefaultNetworkStateHelperExpectations(); 77 SetDefaultNetworkStateHelperExpectations();
78 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); 78 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_);
79 } 79 }
80 80
81 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 81 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
82 InProcessBrowserTest::TearDownInProcessBrowserTestFixture(); 82 InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
83 DBusThreadManager::Shutdown();
84 } 83 }
85 84
86 void EmulateContinueButtonExit(NetworkScreen* network_screen) { 85 void EmulateContinueButtonExit(NetworkScreen* network_screen) {
87 EXPECT_CALL(*mock_screen_observer_, 86 EXPECT_CALL(*mock_screen_observer_,
88 OnExit(ScreenObserver::NETWORK_CONNECTED)) 87 OnExit(ScreenObserver::NETWORK_CONNECTED))
89 .Times(1); 88 .Times(1);
90 EXPECT_CALL(*mock_network_state_helper_, IsConnected()) 89 EXPECT_CALL(*mock_network_state_helper_, IsConnected())
91 .WillOnce(Return(true)); 90 .WillOnce(Return(true));
92 network_screen->OnContinuePressed(); 91 network_screen->OnContinuePressed();
93 content::RunAllPendingInMessageLoop(); 92 content::RunAllPendingInMessageLoop();
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 149
151 // Close infobubble with error message - it makes the test stable. 150 // Close infobubble with error message - it makes the test stable.
152 // EXPECT_FALSE(actor_->IsContinueEnabled()); 151 // EXPECT_FALSE(actor_->IsContinueEnabled());
153 // EXPECT_FALSE(actor_->IsConnecting()); 152 // EXPECT_FALSE(actor_->IsConnecting());
154 // actor_->ClearErrors(); 153 // actor_->ClearErrors();
155 EXPECT_EQ( 154 EXPECT_EQ(
156 1, fake_session_manager_client_->emit_login_prompt_ready_call_count()); 155 1, fake_session_manager_client_->emit_login_prompt_ready_call_count());
157 } 156 }
158 157
159 } // namespace chromeos 158 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698