more changes

chrome/browser/ui/webui/options/certificate_manager_handler.cc

 // Copyright (c) 2011 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/options/certificate_manager_handler.h"
 
 #include "base/file_util.h"  // for FileAccessProvider
 #include "base/memory/scoped_vector.h"
 #include "base/safe_strerror_posix.h"
 #include "base/string_number_conversions.h"
@@ skipping 448 matching lines @@
 
 void CertificateManagerHandler::GetCATrust(const ListValue* args) {
   net::X509Certificate* cert = CallbackArgsToCert(args);
   if (!cert) {
     web_ui_->CallJavascriptFunction("CertificateEditCaTrustOverlay.dismiss");
     return;
   }
 
   int trust = certificate_manager_model_->cert_db().GetCertTrust(
       cert, net::CA_CERT);
-  using base::FundamentalValue;
-  FundamentalValue ssl_value(bool(trust & net::CertDatabase::TRUSTED_SSL));
-  FundamentalValue email_value(bool(trust & net::CertDatabase::TRUSTED_EMAIL));
-  FundamentalValue obj_sign_value(
+  using base::BooleanValue;
+  BooleanValue ssl_value(bool(trust & net::CertDatabase::TRUSTED_SSL));
+  BooleanValue email_value(bool(trust & net::CertDatabase::TRUSTED_EMAIL));
+  BooleanValue obj_sign_value(
       bool(trust & net::CertDatabase::TRUSTED_OBJ_SIGN));
   web_ui_->CallJavascriptFunction(
       "CertificateEditCaTrustOverlay.populateTrust",
       ssl_value, email_value, obj_sign_value);
 }
 
 void CertificateManagerHandler::EditCATrust(const ListValue* args) {
   net::X509Certificate* cert = CallbackArgsToCert(args);
   bool fail = !cert;
   bool trust_ssl = false;
@@ skipping 451 matching lines @@
         subnodes->Append(cert_dict);
       }
       std::sort(subnodes->begin(), subnodes->end(), comparator);
 
       dict->Set(kSubNodesId, subnodes);
       nodes->Append(dict);
     }
     std::sort(nodes->begin(), nodes->end(), comparator);
 
     ListValue args;
-    args.Append(Value::CreateStringValue(tree_name));
+    args.Append(base::StringValue::New(tree_name));
     args.Append(nodes);
     web_ui_->CallJavascriptFunction("CertificateManager.onPopulateTree", args);
   }
 }
 
 void CertificateManagerHandler::ShowError(const std::string& title,
                                           const std::string& error) const {
   ScopedVector<const Value> args;
-  args.push_back(Value::CreateStringValue(title));
-  args.push_back(Value::CreateStringValue(error));
-  args.push_back(Value::CreateStringValue(l10n_util::GetStringUTF8(IDS_OK)));
-  args.push_back(Value::CreateNullValue());  // cancelTitle
-  args.push_back(Value::CreateNullValue());  // okCallback
-  args.push_back(Value::CreateNullValue());  // cancelCallback
+  args.push_back(base::StringValue::New(title));
+  args.push_back(base::StringValue::New(error));
+  args.push_back(base::StringValue::New(l10n_util::GetStringUTF8(IDS_OK)));
+  args.push_back(base::NullValue());  // cancelTitle
+  args.push_back(base::NullValue());  // okCallback
+  args.push_back(base::NullValue());  // cancelCallback
   web_ui_->CallJavascriptFunction("AlertOverlay.show", args.get());
 }
 
 void CertificateManagerHandler::ShowImportErrors(
     const std::string& title,
     const net::CertDatabase::ImportCertFailureList& not_imported) const {
   std::string error;
   if (selected_cert_list_.size() == 1)
     error = l10n_util::GetStringUTF8(
         IDS_CERT_MANAGER_IMPORT_SINGLE_NOT_IMPORTED);
@@ skipping 18 matching lines @@
                                   error_value,
                                   cert_error_list);
 }
 
 #if defined(OS_CHROMEOS)
 void CertificateManagerHandler::CheckTpmTokenReady(const ListValue* args) {
   chromeos::CryptohomeLibrary* cryptohome =
       chromeos::CrosLibrary::Get()->GetCryptohomeLibrary();
 
   // TODO(xiyuan): Use async way when underlying supports it.
-  base::FundamentalValue ready(cryptohome->Pkcs11IsTpmTokenReady());
+  base::BooleanValue ready(cryptohome->Pkcs11IsTpmTokenReady());
   web_ui_->CallJavascriptFunction("CertificateManager.onCheckTpmTokenReady",
                                   ready);
 }
 #endif
 
 gfx::NativeWindow CertificateManagerHandler::GetParentWindow() const {
   return web_ui_->tab_contents()->view()->GetTopLevelNativeWindow();
 }