more changes

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

Index: chrome/browser/ui/webui/options/certificate_manager_handler.cc
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index fe507b519e5cc6789f2086526ebfb0174c8bafb2..b37977e8d2283d9ccafcfea2115d7ad43cdbce6f 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -466,10 +466,10 @@ void CertificateManagerHandler::GetCATrust(const ListValue* args) {
 
   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",
@@ -941,7 +941,7 @@ void CertificateManagerHandler::PopulateTree(const std::string& tab_name,
     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);
   }
@@ -950,12 +950,12 @@ void CertificateManagerHandler::PopulateTree(const std::string& tab_name,
 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());
 }
 
@@ -994,7 +994,7 @@ void CertificateManagerHandler::CheckTpmTokenReady(const ListValue* args) {
       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);
 }