Index: content/browser/service_worker/service_worker_internals_ui.cc |
diff --git a/content/browser/service_worker/service_worker_internals_ui.cc b/content/browser/service_worker/service_worker_internals_ui.cc |
index ed8ddda2f5ea9f77c094a2955bd79b824033dd2b..d18154dad3c50ef1d47fa442df66bc37a8916028 100644 |
--- a/content/browser/service_worker/service_worker_internals_ui.cc |
+++ b/content/browser/service_worker/service_worker_internals_ui.cc |
@@ -33,7 +33,7 @@ |
#include "content/public/common/url_constants.h" |
using base::DictionaryValue; |
-using base::FundamentalValue; |
+using base::Value; |
using base::ListValue; |
using base::StringValue; |
using base::Value; |
@@ -61,9 +61,8 @@ void OperationCompleteCallback(WeakPtr<ServiceWorkerInternalsUI> internals, |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
if (internals) { |
internals->web_ui()->CallJavascriptFunctionUnsafe( |
- "serviceworker.onOperationComplete", |
- FundamentalValue(static_cast<int>(status)), |
- FundamentalValue(callback_id)); |
+ "serviceworker.onOperationComplete", Value(static_cast<int>(status)), |
+ Value(callback_id)); |
} |
} |
@@ -252,7 +251,7 @@ void DidGetRegistrations( |
args.push_back(GetRegistrationListValue(live_registrations)); |
args.push_back(GetVersionListValue(live_versions)); |
args.push_back(GetRegistrationListValue(stored_registrations)); |
- args.push_back(new FundamentalValue(partition_id)); |
+ args.push_back(new Value(partition_id)); |
args.push_back(new StringValue(context_path.value())); |
internals->web_ui()->CallJavascriptFunctionUnsafe( |
"serviceworker.onPartitionData", args.get()); |
@@ -271,14 +270,14 @@ class ServiceWorkerInternalsUI::PartitionObserver |
EmbeddedWorkerStatus) override { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
web_ui_->CallJavascriptFunctionUnsafe( |
- "serviceworker.onRunningStateChanged", FundamentalValue(partition_id_), |
+ "serviceworker.onRunningStateChanged", Value(partition_id_), |
StringValue(base::Int64ToString(version_id))); |
} |
void OnVersionStateChanged(int64_t version_id, |
ServiceWorkerVersion::Status) override { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
web_ui_->CallJavascriptFunctionUnsafe( |
- "serviceworker.onVersionStateChanged", FundamentalValue(partition_id_), |
+ "serviceworker.onVersionStateChanged", Value(partition_id_), |
StringValue(base::Int64ToString(version_id))); |
} |
void OnErrorReported(int64_t version_id, |
@@ -287,10 +286,10 @@ class ServiceWorkerInternalsUI::PartitionObserver |
const ErrorInfo& info) override { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ScopedVector<const Value> args; |
- args.push_back(new FundamentalValue(partition_id_)); |
+ args.push_back(new Value(partition_id_)); |
args.push_back(new StringValue(base::Int64ToString(version_id))); |
- args.push_back(new FundamentalValue(process_id)); |
- args.push_back(new FundamentalValue(thread_id)); |
+ args.push_back(new Value(process_id)); |
+ args.push_back(new Value(thread_id)); |
std::unique_ptr<DictionaryValue> value(new DictionaryValue()); |
value->SetString("message", info.error_message); |
value->SetInteger("lineNumber", info.line_number); |
@@ -306,10 +305,10 @@ class ServiceWorkerInternalsUI::PartitionObserver |
const ConsoleMessage& message) override { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
ScopedVector<const Value> args; |
- args.push_back(new FundamentalValue(partition_id_)); |
+ args.push_back(new Value(partition_id_)); |
args.push_back(new StringValue(base::Int64ToString(version_id))); |
- args.push_back(new FundamentalValue(process_id)); |
- args.push_back(new FundamentalValue(thread_id)); |
+ args.push_back(new Value(process_id)); |
+ args.push_back(new Value(thread_id)); |
std::unique_ptr<DictionaryValue> value(new DictionaryValue()); |
value->SetInteger("sourceIdentifier", message.source_identifier); |
value->SetInteger("message_level", message.message_level); |