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

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

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed superfluous override. Created 6 years, 5 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h" 9 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" 10 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 .WillRepeatedly(Return(mock_error_screen_.get())); 84 .WillRepeatedly(Return(mock_error_screen_.get()));
85 85
86 ASSERT_TRUE(WizardController::default_controller() != NULL); 86 ASSERT_TRUE(WizardController::default_controller() != NULL);
87 update_screen_ = WizardController::default_controller()->GetUpdateScreen(); 87 update_screen_ = WizardController::default_controller()->GetUpdateScreen();
88 ASSERT_TRUE(update_screen_ != NULL); 88 ASSERT_TRUE(update_screen_ != NULL);
89 ASSERT_EQ(WizardController::default_controller()->current_screen(), 89 ASSERT_EQ(WizardController::default_controller()->current_screen(),
90 update_screen_); 90 update_screen_);
91 update_screen_->screen_observer_ = mock_screen_observer_.get(); 91 update_screen_->screen_observer_ = mock_screen_observer_.get();
92 } 92 }
93 93
94 virtual void CleanUpOnMainThread() OVERRIDE { 94 virtual void TearDownOnMainThread() OVERRIDE {
95 mock_error_screen_.reset(); 95 mock_error_screen_.reset();
96 mock_error_screen_actor_.reset(); 96 mock_error_screen_actor_.reset();
97 WizardInProcessBrowserTest::CleanUpOnMainThread(); 97 WizardInProcessBrowserTest::TearDownOnMainThread();
98 } 98 }
99 99
100 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 100 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
101 NetworkPortalDetector::Shutdown(); 101 NetworkPortalDetector::Shutdown();
102 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture(); 102 WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
103 } 103 }
104 104
105 void SetDefaultNetwork(const std::string& guid) { 105 void SetDefaultNetwork(const std::string& guid) {
106 DCHECK(network_portal_detector_); 106 DCHECK(network_portal_detector_);
107 network_portal_detector_->SetDefaultNetworkForTesting(guid); 107 network_portal_detector_->SetDefaultNetworkForTesting(guid);
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED); 396 chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
397 EXPECT_CALL(*mock_screen_observer_, 397 EXPECT_CALL(*mock_screen_observer_,
398 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE)) 398 OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
399 .Times(1); 399 .Times(1);
400 400
401 update_screen_->OnConnectToNetworkRequested(); 401 update_screen_->OnConnectToNetworkRequested();
402 base::MessageLoop::current()->RunUntilIdle(); 402 base::MessageLoop::current()->RunUntilIdle();
403 } 403 }
404 404
405 } // namespace chromeos 405 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698