Commit 0c9a42db authored by Achuith Bhandarkar's avatar Achuith Bhandarkar Committed by Commit Bot

Add skipToUpdateForTesting.

BUG=chromium:790015
TEST=manual

Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I4e1159a3aef37e7bde21f3032de6fdea107080cb
Reviewed-on: https://chromium-review.googlesource.com/822893Reviewed-by: default avatarAlexander Alekseev <alemate@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523727}
parent b9bebd0b
...@@ -687,6 +687,13 @@ void WizardController::SkipToLoginForTesting( ...@@ -687,6 +687,13 @@ void WizardController::SkipToLoginForTesting(
OnDeviceDisabledChecked(false /* device_disabled */); OnDeviceDisabledChecked(false /* device_disabled */);
} }
void WizardController::SkipToUpdateForTesting() {
VLOG(1) << "SkipToUpdateForTesting.";
StartupUtils::MarkEulaAccepted();
PerformPostEulaActions();
InitiateOOBEUpdate();
}
pairing_chromeos::SharkConnectionListener* pairing_chromeos::SharkConnectionListener*
WizardController::GetSharkConnectionListenerForTesting() { WizardController::GetSharkConnectionListenerForTesting() {
return shark_connection_listener_.get(); return shark_connection_listener_.get();
......
...@@ -97,8 +97,9 @@ class WizardController : public BaseScreenDelegate, ...@@ -97,8 +97,9 @@ class WizardController : public BaseScreenDelegate,
// Advances to screen defined by |screen| and shows it. // Advances to screen defined by |screen| and shows it.
void AdvanceToScreen(OobeScreen screen); void AdvanceToScreen(OobeScreen screen);
// Advances to login screen. Should be used in for testing only. // Advances to login/update screen. Should be used in for testing only.
void SkipToLoginForTesting(const LoginScreenContext& context); void SkipToLoginForTesting(const LoginScreenContext& context);
void SkipToUpdateForTesting();
// Should be used for testing only. // Should be used for testing only.
pairing_chromeos::SharkConnectionListener* pairing_chromeos::SharkConnectionListener*
......
...@@ -305,6 +305,14 @@ cr.define('cr.ui', function() { ...@@ -305,6 +305,14 @@ cr.define('cr.ui', function() {
chrome.send('skipToLoginForTesting'); chrome.send('skipToLoginForTesting');
}; };
/**
* Skip to update screen for telemetry.
*/
Oobe.skipToUpdateForTesting = function() {
Oobe.disableSigninUI();
chrome.send('skipToUpdateForTesting');
};
/** /**
* Login for telemetry. * Login for telemetry.
* @param {string} username Login username. * @param {string} username Login username.
......
...@@ -306,6 +306,14 @@ cr.define('cr.ui', function() { ...@@ -306,6 +306,14 @@ cr.define('cr.ui', function() {
chrome.send('skipToLoginForTesting'); chrome.send('skipToLoginForTesting');
}; };
/**
* Skip to update screen for telemetry.
*/
Oobe.skipToUpdateForTesting = function() {
Oobe.disableSigninUI();
chrome.send('skipToUpdateForTesting');
};
/** /**
* Login for telemetry. * Login for telemetry.
* @param {string} username Login username. * @param {string} username Login username.
......
...@@ -175,6 +175,8 @@ void CoreOobeHandler::RegisterMessages() { ...@@ -175,6 +175,8 @@ void CoreOobeHandler::RegisterMessages() {
&CoreOobeHandler::HandleScreenAssetsLoaded); &CoreOobeHandler::HandleScreenAssetsLoaded);
AddRawCallback("skipToLoginForTesting", AddRawCallback("skipToLoginForTesting",
&CoreOobeHandler::HandleSkipToLoginForTesting); &CoreOobeHandler::HandleSkipToLoginForTesting);
AddCallback("skipToUpdateForTesting",
&CoreOobeHandler::HandleSkipToUpdateForTesting);
AddCallback("launchHelpApp", AddCallback("launchHelpApp",
&CoreOobeHandler::HandleLaunchHelpApp); &CoreOobeHandler::HandleLaunchHelpApp);
AddCallback("toggleResetScreen", &CoreOobeHandler::HandleToggleResetScreen); AddCallback("toggleResetScreen", &CoreOobeHandler::HandleToggleResetScreen);
...@@ -388,6 +390,11 @@ void CoreOobeHandler::HandleSkipToLoginForTesting( ...@@ -388,6 +390,11 @@ void CoreOobeHandler::HandleSkipToLoginForTesting(
WizardController::default_controller()->SkipToLoginForTesting(context); WizardController::default_controller()->SkipToLoginForTesting(context);
} }
void CoreOobeHandler::HandleSkipToUpdateForTesting() {
if (WizardController::default_controller())
WizardController::default_controller()->SkipToUpdateForTesting();
}
void CoreOobeHandler::HandleToggleResetScreen() { void CoreOobeHandler::HandleToggleResetScreen() {
ShowDeviceResetScreen(); ShowDeviceResetScreen();
} }
......
...@@ -115,6 +115,7 @@ class CoreOobeHandler : public BaseWebUIHandler, ...@@ -115,6 +115,7 @@ class CoreOobeHandler : public BaseWebUIHandler,
void HandleSetDeviceRequisition(const std::string& requisition); void HandleSetDeviceRequisition(const std::string& requisition);
void HandleScreenAssetsLoaded(const std::string& screen_async_load_id); void HandleScreenAssetsLoaded(const std::string& screen_async_load_id);
void HandleSkipToLoginForTesting(const base::ListValue* args); void HandleSkipToLoginForTesting(const base::ListValue* args);
void HandleSkipToUpdateForTesting();
void HandleLaunchHelpApp(double help_topic_id); void HandleLaunchHelpApp(double help_topic_id);
void HandleToggleResetScreen(); void HandleToggleResetScreen();
void HandleEnableDebuggingScreen(); void HandleEnableDebuggingScreen();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment