Implemented argument wrapping for CallJS.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/eula_screen_handler.h"
 
 #include <string>
 
 #include "base/values.h"

[bartfab (slow), 2013/04/18 07:39:31]

Nit: No longer used.

[ygorshenin1, 2013/04/18 07:58:23]

Done.

 #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"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
@@ skipping 56 matching lines @@
   dict->SetString("rlzEnabled", "enabled");
 #else
   dict->SetString("rlzEnabled", "disabled");
 #endif
 }
 
 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_) {
     Show();
     show_on_init_ = false;
   }
 }
 
 void EulaScreenHandler::RegisterMessages() {
   AddCallback("eulaOnExit", &EulaScreenHandler::HandleOnExit);
   AddCallback("eulaOnLearnMore", &EulaScreenHandler::HandleOnLearnMore);
   AddCallback("eulaOnInstallationSettingsPopupOpened",
               &EulaScreenHandler::HandleOnInstallationSettingsPopupOpened);
 }
 
 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) {
   if (delegate_)
     delegate_->OnExit(accepted, usage_stats_enabled);
 }
 
 void EulaScreenHandler::HandleOnLearnMore() {
   if (!help_app_.get())
     help_app_ = new HelpAppLauncher(GetNativeWindow());
   help_app_->ShowHelpTopic(HelpAppLauncher::HELP_STATS_USAGE);
 }
 
 void EulaScreenHandler::HandleOnInstallationSettingsPopupOpened() {
   if (delegate_)
     delegate_->InitiatePasswordFetch();
 }
 
 }  // namespace chromeos