| Index: chrome/browser/ui/webui/settings/about_handler.cc
|
| diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
|
| index 78fd9d97d62e190ae6083663e6d2b71901e784e2..0cb97e73f7766716437001a0277b08c7179beb13 100644
|
| --- a/chrome/browser/ui/webui/settings/about_handler.cc
|
| +++ b/chrome/browser/ui/webui/settings/about_handler.cc
|
| @@ -17,6 +17,7 @@
|
| #include "base/i18n/message_formatter.h"
|
| #include "base/location.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/string16.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| @@ -574,9 +575,9 @@ void AboutHandler::SetUpdateStatus(VersionUpdater::Status status,
|
| if (!types_msg.empty())
|
| event->SetString("connectionTypes", types_msg);
|
| else
|
| - event->Set("connectionTypes", base::Value::CreateNullValue());
|
| + event->Set("connectionTypes", base::MakeUnique<base::Value>());
|
| } else {
|
| - event->Set("connectionTypes", base::Value::CreateNullValue());
|
| + event->Set("connectionTypes", base::MakeUnique<base::Value>());
|
| }
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| @@ -618,8 +619,7 @@ void AboutHandler::OnRegulatoryLabelDirFound(
|
| std::string callback_id,
|
| const base::FilePath& label_dir_path) {
|
| if (label_dir_path.empty()) {
|
| - ResolveJavascriptCallback(base::Value(callback_id),
|
| - *base::Value::CreateNullValue());
|
| + ResolveJavascriptCallback(base::Value(callback_id), base::Value());
|
| return;
|
| }
|
|
|
|
|