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

Unified Diff: chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Issue 7111033: Ties up OOBE controllers and WebUI handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 1d6d652889717ba49bb886a8d304f465c2172528..338d4db1ef8978f4bce62532ec76d853a1c3da26 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -49,7 +49,7 @@ class MockOutShowHide : public T {
#define MOCK_OLD(mock_var, screen_name, mocked_class) \
mock_var = new MockOutShowHide<mocked_class, int>( \
- static_cast<ViewsOobeDisplay*>(controller()->oobe_display_.get())); \
+ static_cast<ViewsOobeDisplay*>(controller()->oobe_display_)); \
controller()->screen_name.reset(mock_var); \
EXPECT_CALL(*mock_var, Show()).Times(0); \
EXPECT_CALL(*mock_var, Hide()).Times(0);
@@ -260,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, MAYBE_Accelerators) {
//TODO(altimofeev): do not depend on the display realization.
ViewsOobeDisplay* display =
- static_cast<ViewsOobeDisplay*>(controller()->oobe_display_.get());
+ static_cast<ViewsOobeDisplay*>(controller()->oobe_display_);
views::View* contents = display->contents_;
EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
« no previous file with comments | « chrome/browser/chromeos/login/wizard_controller.cc ('k') | chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698