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

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

Issue 10854121: Fixes for handling of MockDBusThreadManager::GetSystemBus(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the build for sure Created 8 years, 4 months 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 <string> 5 #include <string>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/string16.h" 9 #include "base/string16.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 class NetworkScreenTest : public WizardInProcessBrowserTest { 45 class NetworkScreenTest : public WizardInProcessBrowserTest {
46 public: 46 public:
47 NetworkScreenTest(): WizardInProcessBrowserTest("network"), 47 NetworkScreenTest(): WizardInProcessBrowserTest("network"),
48 mock_network_library_(NULL) { 48 mock_network_library_(NULL) {
49 } 49 }
50 50
51 protected: 51 protected:
52 virtual void SetUpInProcessBrowserTestFixture() { 52 virtual void SetUpInProcessBrowserTestFixture() {
53 MockDBusThreadManager* mock_dbus_thread_manager = 53 MockDBusThreadManager* mock_dbus_thread_manager =
54 new MockDBusThreadManager; 54 new MockDBusThreadManager;
55 EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())
56 .WillRepeatedly(Return(reinterpret_cast<dbus::Bus*>(NULL)));
55 DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); 57 DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager);
56 cros_mock_->InitStatusAreaMocks(); 58 cros_mock_->InitStatusAreaMocks();
57 mock_network_library_ = cros_mock_->mock_network_library(); 59 mock_network_library_ = cros_mock_->mock_network_library();
58 MockSessionManagerClient* mock_session_manager_client = 60 MockSessionManagerClient* mock_session_manager_client =
59 mock_dbus_thread_manager->mock_session_manager_client(); 61 mock_dbus_thread_manager->mock_session_manager_client();
60 cellular_.reset(new NetworkDevice("cellular")); 62 cellular_.reset(new NetworkDevice("cellular"));
61 EXPECT_CALL(*mock_session_manager_client, EmitLoginPromptReady()) 63 EXPECT_CALL(*mock_session_manager_client, EmitLoginPromptReady())
62 .Times(1); 64 .Times(1);
63 EXPECT_CALL(*mock_session_manager_client, RetrieveDevicePolicy(_)) 65 EXPECT_CALL(*mock_session_manager_client, RetrieveDevicePolicy(_))
64 .Times(AnyNumber()); 66 .Times(AnyNumber());
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 // EXPECT_FALSE(actor_->IsConnecting()); 288 // EXPECT_FALSE(actor_->IsConnecting());
287 network_screen_->OnConnectionTimeout(); 289 network_screen_->OnConnectionTimeout();
288 290
289 // Close infobubble with error message - it makes the test stable. 291 // Close infobubble with error message - it makes the test stable.
290 // EXPECT_FALSE(actor_->IsContinueEnabled()); 292 // EXPECT_FALSE(actor_->IsContinueEnabled());
291 // EXPECT_FALSE(actor_->IsConnecting()); 293 // EXPECT_FALSE(actor_->IsConnecting());
292 // actor_->ClearErrors(); 294 // actor_->ClearErrors();
293 } 295 }
294 296
295 } // namespace chromeos 297 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698