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

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

Issue 49773003: ChromeOS: Remove MockDBusThreadManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed tests. Created 7 years, 1 month 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/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 : fake_session_manager_client_(NULL) { 403 : fake_session_manager_client_(NULL) {
404 } 404 }
405 405
406 virtual ~WizardControllerBrokenLocalStateTest() {} 406 virtual ~WizardControllerBrokenLocalStateTest() {}
407 407
408 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE { 408 virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
409 WizardControllerTest::SetUpInProcessBrowserTestFixture(); 409 WizardControllerTest::SetUpInProcessBrowserTestFixture();
410 410
411 FakeDBusThreadManager* fake_dbus_thread_manager = 411 FakeDBusThreadManager* fake_dbus_thread_manager =
412 new FakeDBusThreadManager(); 412 new FakeDBusThreadManager();
413 fake_session_manager_client_ = 413 fake_dbus_thread_manager->SetFakeClients();
414 fake_dbus_thread_manager->fake_session_manager_client(); 414 fake_session_manager_client_ = new FakeSessionManagerClient;
415 fake_dbus_thread_manager->SetSessionManagerClient(
416 scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
415 DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); 417 DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
416 } 418 }
417 419
418 virtual void SetUpOnMainThread() OVERRIDE { 420 virtual void SetUpOnMainThread() OVERRIDE {
419 PrefServiceBuilder builder; 421 PrefServiceBuilder builder;
420 local_state_.reset(builder 422 local_state_.reset(builder
421 .WithUserPrefs(new PrefStoreStub()) 423 .WithUserPrefs(new PrefStoreStub())
422 .Create(new PrefRegistrySimple())); 424 .Create(new PrefRegistrySimple()));
423 WizardController::set_local_state_for_testing(local_state_.get()); 425 WizardController::set_local_state_for_testing(local_state_.get());
424 426
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 } 619 }
618 620
619 // TODO(dzhioev): Add test emaulating device with wrong HWID. 621 // TODO(dzhioev): Add test emaulating device with wrong HWID.
620 622
621 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 623 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
622 624
623 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 18, 625 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 18,
624 add_tests_for_new_control_flow_you_just_introduced); 626 add_tests_for_new_control_flow_you_just_introduced);
625 627
626 } // namespace chromeos 628 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698