Implemented argument wrapping for CallJS.

BUG=231331

Review URL: https://chromiumcodereview.appspot.com/14063018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194870 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/webui/chromeos/login/base_screen_handler.cc

@@ -74,32 +74,6 @@ void BaseScreenHandler::CallJS(const std::string& method) {
   web_ui()->CallJavascriptFunction(method);
 }
 
-void BaseScreenHandler::CallJS(const std::string& method,
-                               const base::Value& arg1) {
-  web_ui()->CallJavascriptFunction(method, arg1);
-}
-
-void BaseScreenHandler::CallJS(const std::string& method,
-                               const base::Value& arg1,
-                               const base::Value& arg2) {
-  web_ui()->CallJavascriptFunction(method, arg1, arg2);
-}
-
-void BaseScreenHandler::CallJS(const std::string& method,
-                               const base::Value& arg1,
-                               const base::Value& arg2,
-                               const base::Value& arg3) {
-  web_ui()->CallJavascriptFunction(method, arg1, arg2, arg3);
-}
-
-void BaseScreenHandler::CallJS(const std::string& method,
-                               const base::Value& arg1,
-                               const base::Value& arg2,
-                               const base::Value& arg3,
-                               const base::Value& arg4) {
-  web_ui()->CallJavascriptFunction(method, arg1, arg2, arg3, arg4);
-}
-
 void BaseScreenHandler::ShowScreen(const char* screen_name,
                                    const base::DictionaryValue* data) {
   if (!web_ui())

chrome/browser/ui/webui/chromeos/login/base_screen_handler.h

@@ -92,20 +92,40 @@ class BaseScreenHandler : public content::WebUIMessageHandler {
 
   // Shortcut for calling JS methods on WebUI side.
   void CallJS(const std::string& method);
+
+  template<typename A1>
+  void CallJS(const std::string& method, const A1& arg1) {
+    web_ui()->CallJavascriptFunction(method, MakeValue(arg1));
+  }
+
+  template<typename A1, typename A2>
+  void CallJS(const std::string& method, const A1& arg1, const A2& arg2) {
+    web_ui()->CallJavascriptFunction(method, MakeValue(arg1), MakeValue(arg2));
+  }
+
+  template<typename A1, typename A2, typename A3>
   void CallJS(const std::string& method,
-              const base::Value& arg1);
-  void CallJS(const std::string& method,
-              const base::Value& arg1,
-              const base::Value& arg2);
-  void CallJS(const std::string& method,
-              const base::Value& arg1,
-              const base::Value& arg2,
-              const base::Value& arg3);
+              const A1& arg1,
+              const A2& arg2,
+              const A3& arg3) {
+    web_ui()->CallJavascriptFunction(method,
+                                     MakeValue(arg1),
+                                     MakeValue(arg2),
+                                     MakeValue(arg3));
+  }
+
+  template<typename A1, typename A2, typename A3, typename A4>
   void CallJS(const std::string& method,
-              const base::Value& arg1,
-              const base::Value& arg2,
-              const base::Value& arg3,
-              const base::Value& arg4);
+              const A1& arg1,
+              const A2& arg2,
+              const A3& arg3,
+              const A4& arg4) {
+    web_ui()->CallJavascriptFunction(method,
+                                     MakeValue(arg1),
+                                     MakeValue(arg2),
+                                     MakeValue(arg3),
+                                     MakeValue(arg4));
+  }
 
   // Shortcut methods for adding WebUI callbacks.
   template<typename T>

chrome/browser/ui/webui/chromeos/login/base_screen_handler_utils.h

@@ -63,6 +63,31 @@ inline bool GetArg<string16>(const base::ListValue* args,
   return args->GetString(index, out_value);
 }
 
+inline base::FundamentalValue MakeValue(bool v) {
+  return base::FundamentalValue(v);
+}
+
+inline base::FundamentalValue MakeValue(int v) {
+  return base::FundamentalValue(v);
+}
+
+inline base::FundamentalValue MakeValue(double v) {
+  return base::FundamentalValue(v);
+}
+
+inline base::StringValue MakeValue(const std::string& v) {
+  return base::StringValue(v);
+}
+
+inline base::StringValue MakeValue(const string16& v) {
+  return base::StringValue(v);
+}
+
+template<typename T>
+inline const T& MakeValue(const T& v) {
+  return v;
+}
+
 inline void CallbackWrapper0(base::Callback<void()> callback,
                              const base::ListValue* args) {
   DCHECK(args);

chrome/browser/ui/webui/chromeos/login/core_oobe_handler.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/ui/webui/chromeos/login/core_oobe_handler.h"
 
 #include "base/memory/scoped_ptr.h"
-#include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -156,10 +155,8 @@ void CoreOobeHandler::UpdateOobeUIVisibility() {
       channel == chrome::VersionInfo::CHANNEL_BETA) {
     should_show_version = false;
   }
-  base::FundamentalValue show_version(should_show_version);
-  CallJS("cr.ui.Oobe.showVersion", show_version);
-  base::FundamentalValue show_value(show_oobe_ui_);
-  CallJS("cr.ui.Oobe.showOobeUI", show_value);
+  CallJS("cr.ui.Oobe.showVersion", should_show_version);
+  CallJS("cr.ui.Oobe.showOobeUI", show_oobe_ui_);
 }
 
 void CoreOobeHandler::OnOSVersionLabelTextUpdated(
@@ -174,15 +171,12 @@ void CoreOobeHandler::OnBootTimesLabelTextUpdated(
 
 void CoreOobeHandler::OnEnterpriseInfoUpdated(
     const std::string& message_text) {
-  base::StringValue message_text_vaue(UTF8ToUTF16(message_text));
-  CallJS("cr.ui.Oobe.setEnterpriseInfo", message_text_vaue);
+  CallJS("cr.ui.Oobe.setEnterpriseInfo", message_text);
 }
 
 void CoreOobeHandler::UpdateLabel(const std::string& id,
                                   const std::string& text) {
-  base::StringValue id_value(UTF8ToUTF16(id));
-  base::StringValue text_value(UTF8ToUTF16(text));
-  CallJS("cr.ui.Oobe.setLabelText", id_value, text_value);
+  CallJS("cr.ui.Oobe.setLabelText", id, text);
 }
 
 void CoreOobeHandler::Observe(int type,
@@ -199,4 +193,3 @@ void CoreOobeHandler::Observe(int type,
 }
 
 }  // namespace chromeos
-

chrome/browser/ui/webui/chromeos/login/enterprise_oauth_enrollment_screen_handler.cc

@@ -412,9 +412,7 @@ void EnterpriseOAuthEnrollmentScreenHandler::HandleRetry() {
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowStep(const char* step) {
-  base::StringValue step_value(step);
-  CallJS("oobe.OAuthEnrollmentScreen.showStep",
-         step_value);
+  CallJS("oobe.OAuthEnrollmentScreen.showStep", std::string(step));
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowError(int message_id,
@@ -426,16 +424,12 @@ void EnterpriseOAuthEnrollmentScreenHandler::ShowErrorMessage(
     const std::string& message,
     bool retry) {
   RevokeTokens();
-
-  base::StringValue message_value(message);
-  base::FundamentalValue retry_value(retry);
-  CallJS("oobe.OAuthEnrollmentScreen.showError", message_value, retry_value);
+  CallJS("oobe.OAuthEnrollmentScreen.showError", message, retry);
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::ShowWorking(int message_id) {
-  const std::string message(l10n_util::GetStringUTF8(message_id));
-  base::StringValue message_value(message);
-  CallJS("oobe.OAuthEnrollmentScreen.showWorking", message_value);
+  CallJS("oobe.OAuthEnrollmentScreen.showWorking",
+         l10n_util::GetStringUTF16(message_id));
 }
 
 void EnterpriseOAuthEnrollmentScreenHandler::RevokeTokens() {

chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc

@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/time.h"
-#include "base/values.h"
 #include "chrome/browser/chromeos/login/captive_portal_window_proxy.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/net/network_portal_detector.h"
@@ -88,28 +87,22 @@ void ErrorScreenHandler::HideCaptivePortal() {
 
 void ErrorScreenHandler::SetUIState(ErrorScreen::UIState ui_state) {
   ui_state_ = ui_state;
-  base::FundamentalValue ui_state_value(static_cast<int>(ui_state));
-  CallJS("login.ErrorMessageScreen.setUIState", ui_state_value);
+  CallJS("login.ErrorMessageScreen.setUIState", static_cast<int>(ui_state_));
 }
 
 void ErrorScreenHandler::SetErrorState(ErrorScreen::ErrorState error_state,
                                        const std::string& network) {
   error_state_ = error_state;
-  base::FundamentalValue error_state_value(static_cast<int>(error_state));
-  base::StringValue network_value(network);
   CallJS("login.ErrorMessageScreen.setErrorState",
-         error_state_value,
-         network_value);
+         static_cast<int>(error_state_), network);
 }
 
 void ErrorScreenHandler::AllowGuestSignin(bool allowed) {
-  base::FundamentalValue allowed_value(allowed);
-  CallJS("login.ErrorMessageScreen.allowGuestSignin", allowed_value);
+  CallJS("login.ErrorMessageScreen.allowGuestSignin", allowed);
 }
 
 void ErrorScreenHandler::AllowOfflineLogin(bool allowed) {
-  base::FundamentalValue allowed_value(allowed);
-  CallJS("login.ErrorMessageScreen.allowOfflineLogin", allowed_value);
+  CallJS("login.ErrorMessageScreen.allowOfflineLogin", allowed);
 }
 
 void ErrorScreenHandler::NetworkErrorShown() {

chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc

@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "base/values.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ -83,14 +82,13 @@ void EulaScreenHandler::Initialize() {
   if (!page_is_ready() || !delegate_)
     return;
 
-  base::FundamentalValue checked(delegate_->IsUsageStatsEnabled());
-  CallJS("cr.ui.Oobe.setUsageStats", checked);
+  CallJS("cr.ui.Oobe.setUsageStats", delegate_->IsUsageStatsEnabled());
 
   // This OEM EULA is a file:// URL which we're unable to load in iframe.
   // Instead if it's defined we use chrome://terms/oem that will load same file.
   if (!delegate_->GetOemEulaUrl().is_empty()) {
-    StringValue oem_eula_url(chrome::kChromeUITermsOemURL);
-    CallJS("cr.ui.Oobe.setOemEulaUrl", oem_eula_url);
+    CallJS("cr.ui.Oobe.setOemEulaUrl",
+           std::string(chrome::kChromeUITermsOemURL));
   }
 
   if (show_on_init_) {
@@ -107,8 +105,7 @@ void EulaScreenHandler::RegisterMessages() {
 }
 
 void EulaScreenHandler::OnPasswordFetched(const std::string& tpm_password) {
-  StringValue tpm_password_value(tpm_password);
-  CallJS("cr.ui.Oobe.setTpmPassword", tpm_password_value);
+  CallJS("cr.ui.Oobe.setTpmPassword", tpm_password);
 }
 
 void EulaScreenHandler::HandleOnExit(bool accepted, bool usage_stats_enabled) {

chrome/browser/ui/webui/chromeos/login/locally_managed_user_creation_screen_handler.cc

@@ -155,9 +155,8 @@ void LocallyManagedUserCreationScreenHandler::ShowSuccessMessage() {
 void LocallyManagedUserCreationScreenHandler::ShowErrorPage(
     const string16& message,
     bool recoverable) {
-  CallJS("login.LocallyManagedUserCreationScreen.showErrorMessage",
-         base::StringValue(message),
-         base::FundamentalValue(recoverable));
+  CallJS("login.LocallyManagedUserCreationScreen.showErrorMessage", message,
+         recoverable);
 }
 
 void LocallyManagedUserCreationScreenHandler::SetDelegate(Delegate* delegate) {
@@ -186,13 +185,11 @@ void LocallyManagedUserCreationScreenHandler::HandleCheckLocallyManagedUserName(
   if (NULL != UserManager::Get()->
           FindLocallyManagedUser(CollapseWhitespace(name, true))) {
     CallJS("login.LocallyManagedUserCreationScreen.managedUserNameError",
-           base::StringValue(name),
-           base::StringValue(l10n_util::GetStringFUTF16(
+           name, l10n_util::GetStringFUTF16(
                IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS,
-               name)));
+               name));
   } else {
-    CallJS("login.LocallyManagedUserCreationScreen.managedUserNameOk",
-           base::StringValue(name));
+    CallJS("login.LocallyManagedUserCreationScreen.managedUserNameOk", name);
   }
 }
 
@@ -204,18 +201,17 @@ void LocallyManagedUserCreationScreenHandler::HandleCreateManagedUser(
   const string16 new_user_name = CollapseWhitespace(new_raw_user_name, true);
   if (NULL != UserManager::Get()->FindLocallyManagedUser(new_user_name)) {
     CallJS("login.LocallyManagedUserCreationScreen.managedUserNameError",
-           base::StringValue(new_user_name),
-           base::StringValue(l10n_util::GetStringFUTF16(
+           new_user_name, l10n_util::GetStringFUTF16(
                IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_USERNAME_ALREADY_EXISTS,
-               new_user_name)));
+               new_user_name));
     return;
   }
 
   // TODO(antrim): Any other password checks here?
   if (new_user_password.length() == 0) {
     CallJS("login.LocallyManagedUserCreationScreen.showPasswordError",
-           base::StringValue(l10n_util::GetStringUTF16(
-               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT)));
+           l10n_util::GetStringUTF16(
+               IDS_CREATE_LOCALLY_MANAGED_USER_CREATE_PASSWORD_TOO_SHORT));
     return;
   }
 

chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown_handler.h"
 
-#include "base/values.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/ui/webui/chromeos/login/network_dropdown.h"
 #include "grit/generated_resources.h"

chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc

@@ -67,7 +67,7 @@ void NetworkScreenHandler::Hide() {
 }
 
 void NetworkScreenHandler::ShowError(const string16& message) {
-  CallJS("oobe.NetworkScreen.showError", base::StringValue(message));
+  CallJS("oobe.NetworkScreen.showError", message);
 }
 
 void NetworkScreenHandler::ClearErrors() {
@@ -89,10 +89,8 @@ void NetworkScreenHandler::ShowConnectingStatus(
 
 void NetworkScreenHandler::EnableContinue(bool enabled) {
   is_continue_enabled_ = enabled;
-  if (!page_is_ready())
-    return;
-
-  CallJS("cr.ui.Oobe.enableContinueButton", base::FundamentalValue(enabled));
+  if (page_is_ready())
+    CallJS("cr.ui.Oobe.enableContinueButton", enabled);
 }
 
 // NetworkScreenHandler, BaseScreenHandler implementation: --------------------

chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -780,8 +780,7 @@ void SigninScreenHandler::HandleGetUsers() {
 }
 
 void SigninScreenHandler::ClearAndEnablePassword() {
-  base::FundamentalValue force_online(false);
-  CallJS("cr.ui.Oobe.resetSigninUI", force_online);
+  CallJS("cr.ui.Oobe.resetSigninUI", false);
 }
 
 void SigninScreenHandler::ClearUserPodPassword() {
@@ -789,8 +788,7 @@ void SigninScreenHandler::ClearUserPodPassword() {
 }
 
 void SigninScreenHandler::OnLoginSuccess(const std::string& username) {
-  base::StringValue username_value(username);
-  CallJS("cr.ui.Oobe.onLoginSuccess", username_value);
+  CallJS("cr.ui.Oobe.onLoginSuccess", username);
 }
 
 void SigninScreenHandler::OnUserRemoved(const std::string& username) {
@@ -798,11 +796,8 @@ void SigninScreenHandler::OnUserRemoved(const std::string& username) {
 }
 
 void SigninScreenHandler::OnUserImageChanged(const User& user) {
-  if (!page_is_ready())
-    return;
-
-  base::StringValue user_email(user.email());
-  CallJS("login.AccountPickerScreen.updateUserImage", user_email);
+  if (page_is_ready())
+    CallJS("login.AccountPickerScreen.updateUserImage", user.email());
 }
 
 void SigninScreenHandler::OnPreferencesChanged() {
@@ -829,11 +824,8 @@ void SigninScreenHandler::ShowError(int login_attempts,
                                     const std::string& error_text,
                                     const std::string& help_link_text,
                                     HelpAppLauncher::HelpTopic help_topic_id) {
-  CallJS("cr.ui.Oobe.showSignInError",
-         base::FundamentalValue(login_attempts),
-         base::StringValue(error_text),
-         base::StringValue(help_link_text),
-         base::FundamentalValue(static_cast<int>(help_topic_id)));
+  CallJS("cr.ui.Oobe.showSignInError", login_attempts, error_text,
+         help_link_text, static_cast<int>(help_topic_id));
 }
 
 void SigninScreenHandler::ShowErrorScreen(LoginDisplay::SigninError error_id) {
@@ -848,21 +840,18 @@ void SigninScreenHandler::ShowErrorScreen(LoginDisplay::SigninError error_id) {
 }
 
 void SigninScreenHandler::ShowSigninUI(const std::string& email) {
-  base::StringValue email_value(email);
-  CallJS("cr.ui.Oobe.showSigninUI", email_value);
+  CallJS("cr.ui.Oobe.showSigninUI", email);
 }
 
 void SigninScreenHandler::ShowGaiaPasswordChanged(const std::string& username) {
   email_ = username;
   password_changed_for_.insert(email_);
-  base::StringValue email_value(email_);
-  CallJS("cr.ui.Oobe.showSigninUI", email_value);
-  CallJS("login.AccountPickerScreen.updateUserGaiaNeeded", email_value);
+  CallJS("cr.ui.Oobe.showSigninUI", email_);
+  CallJS("login.AccountPickerScreen.updateUserGaiaNeeded", email_);
 }
 
 void SigninScreenHandler::ShowPasswordChangedDialog(bool show_password_error) {
-  base::FundamentalValue showError(show_password_error);
-  CallJS("cr.ui.Oobe.showPasswordChangedScreen", showError);
+  CallJS("cr.ui.Oobe.showPasswordChangedScreen", show_password_error);
 }
 
 void SigninScreenHandler::ShowSigninScreenForCreds(
@@ -888,10 +877,8 @@ void SigninScreenHandler::OnBrowsingDataRemoverDone() {
 }
 
 void SigninScreenHandler::OnCapsLockChange(bool enabled) {
-  if (page_is_ready()) {
-    base::FundamentalValue capsLockState(enabled);
-    CallJS("login.AccountPickerScreen.setCapsLockState", capsLockState);
-  }
+  if (page_is_ready())
+    CallJS("login.AccountPickerScreen.setCapsLockState", enabled);
 }
 
 void SigninScreenHandler::Observe(int type,
@@ -1045,8 +1032,8 @@ void SigninScreenHandler::UpdateAuthExtension() {
 }
 
 void SigninScreenHandler::UpdateAddButtonStatus() {
-  base::FundamentalValue disabled(AllWhitelistedUsersPresent());
-  CallJS("cr.ui.login.DisplayManager.updateAddUserButtonStatus", disabled);
+  CallJS("cr.ui.login.DisplayManager.updateAddUserButtonStatus",
+         AllWhitelistedUsersPresent());
 }
 
 void SigninScreenHandler::HandleCompleteLogin(const std::string& typed_email,
@@ -1263,10 +1250,8 @@ void SigninScreenHandler::SendUserList(bool animated) {
     }
   }
 
-  base::FundamentalValue animated_value(animated);
-  base::FundamentalValue guest_value(delegate_->IsShowGuest());
-  CallJS("login.AccountPickerScreen.loadUsers",
-         users_list, animated_value, guest_value);
+  CallJS("login.AccountPickerScreen.loadUsers", users_list, animated,
+         delegate_->IsShowGuest());
 }
 
 void SigninScreenHandler::HandleAccountPickerReady() {

chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h"
 
-#include "base/values.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -94,11 +93,8 @@ void TermsOfServiceScreenHandler::Initialize() {
 }
 
 void TermsOfServiceScreenHandler::UpdateDomainInUI() {
-  if (!page_is_ready())
-    return;
-
-  base::StringValue domain(domain_);
-  CallJS("cr.ui.Oobe.setTermsOfServiceDomain", domain);
+  if (page_is_ready())
+    CallJS("cr.ui.Oobe.setTermsOfServiceDomain", domain_);
 }
 
 void TermsOfServiceScreenHandler::UpdateTermsOfServiceInUI() {
@@ -109,13 +105,10 @@ void TermsOfServiceScreenHandler::UpdateTermsOfServiceInUI() {
   // Terms of Service has completed and the UI should be updated. Otherwise, the
   // download is still in progress and the UI will be updated when the
   // OnLoadError() or the OnLoadSuccess() callback is called.
-  if (load_error_) {
-    web_ui()->CallJavascriptFunction("cr.ui.Oobe.setTermsOfServiceLoadError");
-  } else if (!terms_of_service_.empty()) {
-    base::StringValue terms_of_service(terms_of_service_);
-    web_ui()->CallJavascriptFunction("cr.ui.Oobe.setTermsOfService",
-                                     terms_of_service);
-  }
+  if (load_error_)
+    CallJS("cr.ui.Oobe.setTermsOfServiceLoadError");
+  else if (!terms_of_service_.empty())
+    CallJS("cr.ui.Oobe.setTermsOfService", terms_of_service_);
 }
 
 void TermsOfServiceScreenHandler::HandleBack() {

chrome/browser/ui/webui/chromeos/login/update_screen_handler.cc

@@ -78,28 +78,24 @@ void UpdateScreenHandler::PrepareToShow() {
 }
 
 void UpdateScreenHandler::ShowManualRebootInfo() {
-  StringValue message(l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
-  CallJS("cr.ui.Oobe.setUpdateMessage", message);
+  CallJS("cr.ui.Oobe.setUpdateMessage",
+         l10n_util::GetStringUTF16(IDS_UPDATE_COMPLETED));
 }
 
 void UpdateScreenHandler::SetProgress(int progress) {
-  base::FundamentalValue progress_value(progress);
-  CallJS("cr.ui.Oobe.setUpdateProgress", progress_value);
+  CallJS("cr.ui.Oobe.setUpdateProgress", progress);
 }
 
 void UpdateScreenHandler::ShowEstimatedTimeLeft(bool visible) {
-  base::FundamentalValue visible_value(visible);
-  CallJS("cr.ui.Oobe.showEstimatedTimeLeft", visible_value);
+  CallJS("cr.ui.Oobe.showEstimatedTimeLeft", visible);
 }
 
 void UpdateScreenHandler::SetEstimatedTimeLeft(const base::TimeDelta& time) {
-  base::FundamentalValue seconds_value(time.InSecondsF());
-  CallJS("cr.ui.Oobe.setEstimatedTimeLeft", seconds_value);
+  CallJS("cr.ui.Oobe.setEstimatedTimeLeft", time.InSecondsF());
 }
 
 void UpdateScreenHandler::ShowProgressMessage(bool visible) {
-  base::FundamentalValue visible_value(visible);
-  CallJS("cr.ui.Oobe.showProgressMessage", visible_value);
+  CallJS("cr.ui.Oobe.showProgressMessage", visible);
 }
 
 void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
@@ -130,8 +126,7 @@ void UpdateScreenHandler::SetProgressMessage(ProgressMessage message) {
 }
 
 void UpdateScreenHandler::ShowCurtain(bool visible) {
-  base::FundamentalValue visible_value(visible);
-  CallJS("cr.ui.Oobe.showUpdateCurtain", visible_value);
+  CallJS("cr.ui.Oobe.showUpdateCurtain", visible);
 }
 
 void UpdateScreenHandler::RegisterMessages() {

chrome/browser/ui/webui/chromeos/login/user_image_screen_handler.cc

@@ -99,11 +99,8 @@ void UserImageScreenHandler::PrepareToShow() {
 
 void UserImageScreenHandler::SelectImage(int index) {
   selected_image_ = index;
-  if (page_is_ready()) {
-    base::StringValue image_url(GetDefaultImageUrl(index));
-    CallJS("oobe.UserImageScreen.setSelectedImage",
-           image_url);
-  }
+  if (page_is_ready())
+    CallJS("oobe.UserImageScreen.setSelectedImage", GetDefaultImageUrl(index));
 }
 
 void UserImageScreenHandler::CheckCameraPresence() {
@@ -130,10 +127,8 @@ void UserImageScreenHandler::AddProfileImage(const gfx::ImageSkia& image) {
 }
 
 void UserImageScreenHandler::SendProfileImage(const std::string& data_url) {
-  if (page_is_ready()) {
-    base::StringValue data_url_value(data_url);
-    CallJS("oobe.UserImageScreen.setProfileImage", data_url_value);
-  }
+  if (page_is_ready())
+    CallJS("oobe.UserImageScreen.setProfileImage", data_url);
 }
 
 void UserImageScreenHandler::OnProfileImageAbsent() {
@@ -239,9 +234,8 @@ void UserImageScreenHandler::HandleScreenShown() {
 }
 
 void UserImageScreenHandler::OnCameraPresenceCheckDone() {
-  base::FundamentalValue present_value(
-      CameraDetector::camera_presence() == CameraDetector::kCameraPresent);
-  CallJS("oobe.UserImageScreen.setCameraPresent", present_value);
+  CallJS("oobe.UserImageScreen.setCameraPresent",
+         CameraDetector::camera_presence() == CameraDetector::kCameraPresent);
 }
 
 void UserImageScreenHandler::OnImageDecoded(const ImageDecoder* decoder,
@@ -257,8 +251,7 @@ void UserImageScreenHandler::OnDecodeImageFailed(const ImageDecoder* decoder) {
 }
 
 void UserImageScreenHandler::SetProfilePictureEnabled(bool enabled) {
-  base::FundamentalValue present_value(enabled);
-  CallJS("oobe.UserImageScreen.setProfilePictureEnabled", present_value);
+  CallJS("oobe.UserImageScreen.setProfilePictureEnabled", enabled);
 }
 
 }  // namespace chromeos