Remove base::Value::CreateNullValue
This change removes base::Value::CreateNullValue in favor of Value's default constructor. In particular, this change
- Replaces |Value::CreateNullValue()| with |MakeUnique<Value>()|.
- Adds #includes of base/memory/ptr_util.h where needed.
- Replaces |std::unique_ptr<Value>| with |auto| where appropriate.
- Replaces |*Value::CreateNullValue()| with |Value()|.
- Replaces |Value::CreateNullValue().release()| with |new Value()|.
BUG=646113
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
Review-Url: https://codereview.chromium.org/2792573002
Cr-Commit-Position: refs/heads/master@{#462794}
diff --git a/base/json/json_parser.cc b/base/json/json_parser.cc
index c6f6409d..a91038c 100644
--- a/base/json/json_parser.cc
+++ b/base/json/json_parser.cc
@@ -804,7 +804,7 @@
return nullptr;
}
NextNChars(kNullLen - 1);
- return Value::CreateNullValue();
+ return MakeUnique<Value>();
}
default:
ReportError(JSONReader::JSON_UNEXPECTED_TOKEN, 1);
diff --git a/base/json/json_writer_unittest.cc b/base/json/json_writer_unittest.cc
index 6cb236f..de4ab61 100644
--- a/base/json/json_writer_unittest.cc
+++ b/base/json/json_writer_unittest.cc
@@ -15,7 +15,7 @@
std::string output_js;
// Test null.
- EXPECT_TRUE(JSONWriter::Write(*Value::CreateNullValue(), &output_js));
+ EXPECT_TRUE(JSONWriter::Write(Value(), &output_js));
EXPECT_EQ("null", output_js);
// Test empty dict.
diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc
index ab12cfb..0cd8ea2 100644
--- a/base/test/values_test_util.cc
+++ b/base/test/values_test_util.cc
@@ -7,6 +7,7 @@
#include <memory>
#include "base/json/json_reader.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -68,7 +69,7 @@
json, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error_msg);
if (!result) {
ADD_FAILURE() << "Failed to parse \"" << json << "\": " << error_msg;
- result = Value::CreateNullValue();
+ result = MakeUnique<Value>();
}
return result;
}
diff --git a/base/values.cc b/base/values.cc
index 6ba7e8558..d492a47 100644
--- a/base/values.cc
+++ b/base/values.cc
@@ -76,11 +76,6 @@
} // namespace
// static
-std::unique_ptr<Value> Value::CreateNullValue() {
- return WrapUnique(new Value(Type::NONE));
-}
-
-// static
std::unique_ptr<BinaryValue> BinaryValue::CreateWithCopiedBuffer(
const char* buffer,
size_t size) {
@@ -1091,7 +1086,7 @@
if (index >= list_->size()) {
// Pad out any intermediate indexes with null settings
while (index > list_->size())
- Append(CreateNullValue());
+ Append(MakeUnique<Value>());
Append(std::move(in_value));
} else {
// TODO(dcheng): remove this DCHECK once the raw pointer version is removed?
diff --git a/base/values.h b/base/values.h
index 925152db..e19eca7 100644
--- a/base/values.h
+++ b/base/values.h
@@ -63,8 +63,6 @@
// Note: Do not add more types. See the file-level comment above for why.
};
- static std::unique_ptr<Value> CreateNullValue();
-
// For situations where you want to keep ownership of your buffer, this
// factory method creates a new BinaryValue by copying the contents of the
// buffer that's passed in.
@@ -178,7 +176,7 @@
bool Equals(const Value* other) const;
// Compares if two Value objects have equal contents. Can handle NULLs.
- // NULLs are considered equal but different from Value::CreateNullValue().
+ // NULLs are considered equal but different from Value(Value::Type::NONE).
// DEPRECATED, use operator==(const Value& lhs, const Value& rhs) instead.
// TODO(crbug.com/646113): Delete this and migrate callsites.
static bool Equals(const Value* a, const Value* b);
diff --git a/base/values_unittest.cc b/base/values_unittest.cc
index da2989f..85f0a10e 100644
--- a/base/values_unittest.cc
+++ b/base/values_unittest.cc
@@ -583,8 +583,8 @@
TEST(ValuesTest, DictionaryWithoutPathExpansion) {
DictionaryValue dict;
- dict.Set("this.is.expanded", Value::CreateNullValue());
- dict.SetWithoutPathExpansion("this.isnt.expanded", Value::CreateNullValue());
+ dict.Set("this.is.expanded", MakeUnique<Value>());
+ dict.SetWithoutPathExpansion("this.isnt.expanded", MakeUnique<Value>());
EXPECT_FALSE(dict.HasKey("this.is.expanded"));
EXPECT_TRUE(dict.HasKey("this"));
@@ -607,8 +607,8 @@
// TODO(estade): remove.
TEST(ValuesTest, DictionaryWithoutPathExpansionDeprecated) {
DictionaryValue dict;
- dict.Set("this.is.expanded", Value::CreateNullValue());
- dict.SetWithoutPathExpansion("this.isnt.expanded", Value::CreateNullValue());
+ dict.Set("this.is.expanded", MakeUnique<Value>());
+ dict.SetWithoutPathExpansion("this.isnt.expanded", MakeUnique<Value>());
EXPECT_FALSE(dict.HasKey("this.is.expanded"));
EXPECT_TRUE(dict.HasKey("this"));
@@ -654,7 +654,7 @@
TEST(ValuesTest, DeepCopy) {
DictionaryValue original_dict;
- std::unique_ptr<Value> scoped_null = Value::CreateNullValue();
+ auto scoped_null = MakeUnique<Value>();
Value* original_null = scoped_null.get();
original_dict.Set("null", std::move(scoped_null));
std::unique_ptr<Value> scoped_bool(new Value(true));
@@ -802,8 +802,8 @@
}
TEST(ValuesTest, Equals) {
- std::unique_ptr<Value> null1(Value::CreateNullValue());
- std::unique_ptr<Value> null2(Value::CreateNullValue());
+ auto null1 = MakeUnique<Value>();
+ auto null2 = MakeUnique<Value>();
EXPECT_NE(null1.get(), null2.get());
EXPECT_EQ(*null1, *null2);
@@ -816,14 +816,14 @@
dv.SetDouble("c", 2.5);
dv.SetString("d1", "string");
dv.SetString("d2", ASCIIToUTF16("http://google.com"));
- dv.Set("e", Value::CreateNullValue());
+ dv.Set("e", MakeUnique<Value>());
auto copy = MakeUnique<DictionaryValue>(dv);
EXPECT_EQ(dv, *copy);
std::unique_ptr<ListValue> list(new ListValue);
ListValue* original_list = list.get();
- list->Append(Value::CreateNullValue());
+ list->Append(MakeUnique<Value>());
list->Append(WrapUnique(new DictionaryValue));
auto list_copy = MakeUnique<Value>(*list);
@@ -844,8 +844,8 @@
}
TEST(ValuesTest, StaticEquals) {
- std::unique_ptr<Value> null1(Value::CreateNullValue());
- std::unique_ptr<Value> null2(Value::CreateNullValue());
+ auto null1 = MakeUnique<Value>();
+ auto null2 = MakeUnique<Value>();
EXPECT_TRUE(Value::Equals(null1.get(), null2.get()));
EXPECT_TRUE(Value::Equals(NULL, NULL));
@@ -859,7 +859,7 @@
EXPECT_FALSE(Value::Equals(i42.get(), NULL));
EXPECT_FALSE(Value::Equals(NULL, i42.get()));
- // NULL and Value::CreateNullValue() are intentionally different: We need
+ // NULL and MakeUnique<Value>() are intentionally different: We need
// support for NULL as a return value for "undefined" without caring for
// ownership of the pointer.
EXPECT_FALSE(Value::Equals(null1.get(), NULL));
@@ -988,7 +988,7 @@
TEST(ValuesTest, DeepCopyCovariantReturnTypes) {
DictionaryValue original_dict;
- std::unique_ptr<Value> scoped_null(Value::CreateNullValue());
+ auto scoped_null = MakeUnique<Value>();
Value* original_null = scoped_null.get();
original_dict.Set("null", std::move(scoped_null));
std::unique_ptr<Value> scoped_bool(new Value(true));
diff --git a/cc/benchmarks/invalidation_benchmark.cc b/cc/benchmarks/invalidation_benchmark.cc
index 89f5973f..6a61522 100644
--- a/cc/benchmarks/invalidation_benchmark.cc
+++ b/cc/benchmarks/invalidation_benchmark.cc
@@ -9,6 +9,7 @@
#include <algorithm>
#include <limits>
+#include "base/memory/ptr_util.h"
#include "base/rand_util.h"
#include "base/values.h"
#include "cc/layers/layer.h"
@@ -123,7 +124,7 @@
if (message->HasKey("notify_done")) {
message->GetBoolean("notify_done", ¬ify_done);
if (notify_done)
- NotifyDone(base::Value::CreateNullValue());
+ NotifyDone(base::MakeUnique<base::Value>());
return true;
}
return false;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 40b22ead..fbf927a 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -336,7 +336,7 @@
"CWS OAuth token fetch failed. OAuth2TokenService can't "
"be retrieved.");
}
- SetResult(base::Value::CreateNullValue());
+ SetResult(base::MakeUnique<base::Value>());
return false;
}
@@ -373,7 +373,7 @@
"CWS OAuth token fetch failed. (DriveApiErrorCode: %s)",
google_apis::DriveApiErrorCodeToString(code).c_str());
}
- SetResult(base::Value::CreateNullValue());
+ SetResult(base::MakeUnique<base::Value>());
SendResponse(false);
}
}
diff --git a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
index ded0f9f..8283d9c 100644
--- a/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
+++ b/chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.cc
@@ -266,7 +266,7 @@
std::unique_ptr<base::Value> sanitized_config =
SanitizeNetworkConfig(entry->value.get());
if (!sanitized_config)
- sanitized_config = base::Value::CreateNullValue();
+ sanitized_config = base::MakeUnique<base::Value>();
policies->Set(policy_name(), entry->level, entry->scope, entry->source,
std::move(sanitized_config), nullptr);
diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc
index b5ef95fc..a62a3dd 100644
--- a/chrome/browser/devtools/devtools_file_helper.cc
+++ b/chrome/browser/devtools/devtools_file_helper.cc
@@ -13,6 +13,7 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
#include "base/md5.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/value_conversions.h"
#include "chrome/browser/browser_process.h"
@@ -385,7 +386,7 @@
prefs::kDevToolsFileSystemPaths);
base::DictionaryValue* file_systems_paths_value = update.Get();
file_systems_paths_value->SetWithoutPathExpansion(
- file_system_path, base::Value::CreateNullValue());
+ file_system_path, base::MakeUnique<base::Value>());
}
std::vector<DevToolsFileHelper::FileSystem>
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index 4939ff2..cee1a77f 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -13,6 +13,7 @@
#include "base/bind.h"
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
+#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -258,7 +259,7 @@
// The cookie doesn't exist; return null.
if (!results_)
- SetResult(base::Value::CreateNullValue());
+ SetResult(base::MakeUnique<base::Value>());
bool rv = BrowserThread::PostTask(
BrowserThread::UI, FROM_HERE,
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc b/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc
index 539f94b..f043941 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc
@@ -6,6 +6,7 @@
#include <utility>
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -36,7 +37,7 @@
std::unique_ptr<api::settings_private::PrefObject> pref =
prefs_util_->GetPref(name);
if (!pref)
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
return pref->ToValue();
}
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index fb448f7..e4ec50d3 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -658,7 +658,7 @@
!browser_context()->IsOffTheRecord() && !include_incognito()) {
// Don't expose incognito windows if extension itself works in non-incognito
// profile and CanCrossIncognito isn't allowed.
- result = base::Value::CreateNullValue();
+ result = base::MakeUnique<base::Value>();
} else {
result = controller->CreateWindowValueWithTabs(extension());
}
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
index 4064afc..2cc3ea48 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
#include "base/lazy_instance.h"
+#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api_constants.h"
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.h"
@@ -476,7 +477,7 @@
include_incognito(), nullptr, nullptr,
&web_contents, nullptr) ||
!web_contents) {
- return RespondNow(OneArgument(base::Value::CreateNullValue()));
+ return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
}
WebNavigationTabObserver* observer =
@@ -490,11 +491,11 @@
ExtensionApiFrameIdMap::Get()->GetRenderFrameHostById(web_contents,
frame_id);
if (!frame_navigation_state.IsValidFrame(render_frame_host))
- return RespondNow(OneArgument(base::Value::CreateNullValue()));
+ return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
GURL frame_url = frame_navigation_state.GetUrl(render_frame_host);
if (!frame_navigation_state.IsValidUrl(frame_url))
- return RespondNow(OneArgument(base::Value::CreateNullValue()));
+ return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
GetFrame::Results::Details frame_details;
frame_details.url = frame_url.spec();
@@ -516,7 +517,7 @@
include_incognito(), nullptr, nullptr,
&web_contents, nullptr) ||
!web_contents) {
- return RespondNow(OneArgument(base::Value::CreateNullValue()));
+ return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
}
WebNavigationTabObserver* observer =
diff --git a/chrome/browser/policy/test/local_policy_test_server.cc b/chrome/browser/policy/test/local_policy_test_server.cc
index a3bf21a..0f9a9d9a4 100644
--- a/chrome/browser/policy/test/local_policy_test_server.cc
+++ b/chrome/browser/policy/test/local_policy_test_server.cc
@@ -13,6 +13,7 @@
#include "base/base_paths.h"
#include "base/files/file_util.h"
#include "base/json/json_writer.h"
+#include "base/memory/ptr_util.h"
#include "base/numerics/safe_conversions.h"
#include "base/path_service.h"
#include "base/strings/stringprintf.h"
@@ -245,7 +246,7 @@
arguments->SetString("policy-key", policy_key_.AsUTF8Unsafe());
if (automatic_rotation_of_signing_keys_enabled_) {
arguments->Set("rotate-policy-keys-automatically",
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
}
if (server_data_dir_.IsValid()) {
arguments->SetString("data-dir", server_data_dir_.GetPath().AsUTF8Unsafe());
diff --git a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
index 0783205e..0aa2d823 100644
--- a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
@@ -13,6 +13,7 @@
#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/safe_browsing/incident_reporting/incident.h"
#include "chrome/browser/safe_browsing/incident_reporting/mock_incident_receiver.h"
@@ -129,7 +130,7 @@
using base::Value;
switch (value_type) {
case Value::Type::NONE:
- return Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
case Value::Type::BOOLEAN:
return std::unique_ptr<Value>(new base::Value(false));
case Value::Type::INTEGER:
@@ -212,7 +213,7 @@
TEST_P(PreferenceValidationDelegateNoIncident, Atomic) {
instance_->OnAtomicPreferenceValidation(
- kPrefPath, base::Value::CreateNullValue(), value_state_,
+ kPrefPath, base::MakeUnique<base::Value>(), value_state_,
external_validation_value_state_, false /* is_personal */);
EXPECT_EQ(0U, incidents_.size());
}
@@ -255,7 +256,7 @@
TEST_P(PreferenceValidationDelegateWithIncident, Atomic) {
instance_->OnAtomicPreferenceValidation(
- kPrefPath, base::Value::CreateNullValue(), value_state_,
+ kPrefPath, base::MakeUnique<base::Value>(), value_state_,
external_validation_value_state_, is_personal_);
ASSERT_EQ(1U, incidents_.size());
std::unique_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
diff --git a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc
index fc01881..f3319f57 100644
--- a/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/first_run/first_run_handler.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/webui/chromeos/first_run/first_run_handler.h"
#include "base/bind.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "content/public/browser/web_ui.h"
@@ -50,7 +51,7 @@
int x,
int y,
int offset) {
- std::unique_ptr<base::Value> null = base::Value::CreateNullValue();
+ auto null = base::MakeUnique<base::Value>();
base::ListValue point_with_offset;
point_with_offset.AppendInteger(x);
point_with_offset.AppendInteger(y);
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
index a785c2556..c924a72 100644
--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc
@@ -361,7 +361,7 @@
web_ui()->CallJavascriptFunctionUnsafe(
"local_discovery.onUnregisteredDeviceUpdate", service_key, info);
} else {
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
web_ui()->CallJavascriptFunctionUnsafe(
"local_discovery.onUnregisteredDeviceUpdate", service_key, *null_value);
@@ -370,7 +370,7 @@
void LocalDiscoveryUIHandler::DeviceRemoved(const std::string& name) {
device_descriptions_.erase(name);
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
base::Value name_value(kKeyPrefixMDns + name);
web_ui()->CallJavascriptFunctionUnsafe(
diff --git a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
index 5c223c5..f4ac35ec 100644
--- a/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
+++ b/chrome/browser/ui/webui/media_router/media_router_webui_message_handler.cc
@@ -286,9 +286,9 @@
base::Value(sink_id), *route_value,
base::Value(route->for_display()));
} else {
- web_ui()->CallJavascriptFunctionUnsafe(
- kOnCreateRouteResponseReceived, base::Value(sink_id),
- *base::Value::CreateNullValue(), base::Value(false));
+ web_ui()->CallJavascriptFunctionUnsafe(kOnCreateRouteResponseReceived,
+ base::Value(sink_id), base::Value(),
+ base::Value(false));
}
}
@@ -306,8 +306,7 @@
void MediaRouterWebUIMessageHandler::ClearIssue() {
DVLOG(2) << "ClearIssue";
- web_ui()->CallJavascriptFunctionUnsafe(kSetIssue,
- *base::Value::CreateNullValue());
+ web_ui()->CallJavascriptFunctionUnsafe(kSetIssue, base::Value());
}
void MediaRouterWebUIMessageHandler::UpdateMaxDialogHeight(int height) {
diff --git a/chrome/browser/ui/webui/options/certificate_manager_handler.cc b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
index eda33f4..cce634b 100644
--- a/chrome/browser/ui/webui/options/certificate_manager_handler.cc
+++ b/chrome/browser/ui/webui/options/certificate_manager_handler.cc
@@ -1195,9 +1195,9 @@
auto error_value = base::MakeUnique<base::Value>(error);
auto ok_title_value =
base::MakeUnique<base::Value>(l10n_util::GetStringUTF8(IDS_OK));
- auto cancel_title_value = base::Value::CreateNullValue();
- auto ok_callback_value = base::Value::CreateNullValue();
- auto cancel_callback_value = base::Value::CreateNullValue();
+ auto cancel_title_value = base::MakeUnique<base::Value>();
+ auto ok_callback_value = base::MakeUnique<base::Value>();
+ auto cancel_callback_value = base::MakeUnique<base::Value>();
std::vector<const base::Value*> args = {
title_value.get(), error_value.get(),
ok_title_value.get(), cancel_title_value.get(),
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index 342e88fd..5f5e031 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -177,7 +177,7 @@
base::Value* value = nullptr;
proxy_cros_settings_parser::GetProxyPrefValue(
network_guid_, pref_name, GetUiProxyConfigService(), &value);
- return value ? value : base::Value::CreateNullValue().release();
+ return value ? value : new base::Value();
}
Profile* profile = Profile::FromWebUI(web_ui());
@@ -205,7 +205,7 @@
const base::Value* pref_value = CrosSettings::Get()->GetPref(pref_name);
if (!pref_value)
- return base::Value::CreateNullValue().release();
+ return new base::Value();
// Decorate pref value as CoreOptionsHandler::CreateValueForPref() does.
// TODO(estade): seems that this should replicate CreateValueForPref less.
diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc
index fed3637..7b1a4bb 100644
--- a/chrome/browser/ui/webui/options/cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
@@ -159,7 +160,7 @@
base::ListValue args;
if (parent == tree_model->GetRoot())
- args.Append(base::Value::CreateNullValue());
+ args.Append(base::MakeUnique<base::Value>());
else
args.AppendString(model_util_->GetTreeNodeId(parent_node));
args.AppendInteger(start);
@@ -179,7 +180,7 @@
base::ListValue args;
if (parent == tree_model->GetRoot())
- args.Append(base::Value::CreateNullValue());
+ args.Append(base::MakeUnique<base::Value>());
else
args.AppendString(model_util_->GetTreeNodeId(tree_model->AsNode(parent)));
args.AppendInteger(start);
@@ -279,7 +280,7 @@
base::ListValue args;
if (parent == cookies_tree_model_->GetRoot())
- args.Append(base::Value::CreateNullValue());
+ args.Append(base::MakeUnique<base::Value>());
else
args.AppendString(model_util_->GetTreeNodeId(parent));
args.Append(std::move(children));
diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc
index 71ba099..c7098cab 100644
--- a/chrome/browser/ui/webui/options/core_options_handler.cc
+++ b/chrome/browser/ui/webui/options/core_options_handler.cc
@@ -372,7 +372,7 @@
pref_service->FindPreference(pref_name);
if (!pref) {
NOTREACHED();
- return base::Value::CreateNullValue().release();
+ return new base::Value();
}
const PrefService::Preference* controlling_pref =
pref_service->FindPreference(controlling_pref_name);
diff --git a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
index f22ec21..8ab3ddd 100644
--- a/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview/print_preview_handler.cc
@@ -1311,7 +1311,7 @@
std::unique_ptr<base::DictionaryValue> destination_info) {
auto response = base::MakeUnique<base::DictionaryValue>();
bool success = true;
- auto caps_value = base::Value::CreateNullValue();
+ auto caps_value = base::MakeUnique<base::Value>();
auto caps = base::MakeUnique<base::DictionaryValue>();
if (destination_info &&
destination_info->Remove(printing::kPrinterCapabilities, &caps_value) &&
diff --git a/chrome/browser/ui/webui/settings/about_handler.cc b/chrome/browser/ui/webui/settings/about_handler.cc
index 78fd9d9..0cb97e7 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 @@
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 @@
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;
}
diff --git a/chrome/browser/ui/webui/settings/certificates_handler.cc b/chrome/browser/ui/webui/settings/certificates_handler.cc
index 8df7172..9930c7b 100644
--- a/chrome/browser/ui/webui/settings/certificates_handler.cc
+++ b/chrome/browser/ui/webui/settings/certificates_handler.cc
@@ -458,7 +458,7 @@
case IMPORT_SERVER_FILE_SELECTED:
case IMPORT_CA_FILE_SELECTED:
ImportExportCleanup();
- RejectCallback(*base::Value::CreateNullValue());
+ RejectCallback(base::Value());
break;
default:
NOTREACHED();
@@ -541,7 +541,7 @@
l10n_util::GetStringUTF8(
IDS_SETTINGS_CERTIFICATE_MANAGER_UNKNOWN_ERROR));
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
}
@@ -573,7 +573,7 @@
void CertificatesHandler::ExportPersonalFileSelected(
const base::FilePath& path) {
file_path_ = path;
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
void CertificatesHandler::HandleExportPersonalPasswordSelected(
@@ -627,7 +627,7 @@
IDS_SETTINGS_CERTIFICATE_MANAGER_WRITE_ERROR_FORMAT,
UTF8ToUTF16(base::safe_strerror(*write_errno))));
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
}
@@ -743,7 +743,7 @@
int string_id;
switch (result) {
case net::OK:
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
return;
case net::ERR_PKCS12_IMPORT_BAD_PASSWORD:
// TODO(mattm): if the error was a bad password, we should reshow the
@@ -850,7 +850,7 @@
IDS_SETTINGS_CERTIFICATE_MANAGER_SERVER_IMPORT_ERROR_TITLE),
not_imported);
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
ImportExportCleanup();
}
@@ -942,7 +942,7 @@
IDS_SETTINGS_CERTIFICATE_MANAGER_CA_IMPORT_ERROR_TITLE),
not_imported);
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
ImportExportCleanup();
}
@@ -972,7 +972,7 @@
l10n_util::GetStringUTF8(
IDS_SETTINGS_CERTIFICATE_MANAGER_UNKNOWN_ERROR));
} else {
- ResolveCallback(*base::Value::CreateNullValue());
+ ResolveCallback(base::Value());
}
}
diff --git a/chrome/browser/ui/webui/settings/on_startup_handler.cc b/chrome/browser/ui/webui/settings/on_startup_handler.cc
index 10b4b26..b42ffc8 100644
--- a/chrome/browser/ui/webui/settings/on_startup_handler.cc
+++ b/chrome/browser/ui/webui/settings/on_startup_handler.cc
@@ -41,7 +41,7 @@
extensions::GetExtensionOverridingNewTabPage(profile);
if (!ntp_extension) {
- ResolveJavascriptCallback(*callback_id, *base::Value::CreateNullValue());
+ ResolveJavascriptCallback(*callback_id, base::Value());
return;
}
diff --git a/chrome/browser/ui/webui/settings/reset_settings_handler.cc b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
index 00ed485..7f308252 100644
--- a/chrome/browser/ui/webui/settings/reset_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/reset_settings_handler.cc
@@ -157,8 +157,7 @@
std::string callback_id,
bool send_feedback,
reset_report::ChromeResetReport::ResetRequestOrigin request_origin) {
- ResolveJavascriptCallback(base::Value(callback_id),
- *base::Value::CreateNullValue());
+ ResolveJavascriptCallback(base::Value(callback_id), base::Value());
if (send_feedback && setting_snapshot_) {
ResettableSettingsSnapshot current_snapshot(profile_);
int difference = setting_snapshot_->FindDifferentFields(current_snapshot);
diff --git a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
index 70be7a4..2c47be3 100644
--- a/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_clear_browsing_data_handler.cc
@@ -262,9 +262,7 @@
for (const auto& counter : counters_)
counter->Restart();
- ResolveJavascriptCallback(
- *callback_id,
- *base::Value::CreateNullValue() /* Promise<void> */);
+ ResolveJavascriptCallback(*callback_id, base::Value() /* Promise<void> */);
}
void ClearBrowsingDataHandler::OnStateChanged(syncer::SyncService* sync) {
diff --git a/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc b/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc
index fef6e14c..a0fb7dca 100644
--- a/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_cookies_view_handler.cc
@@ -10,6 +10,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
@@ -102,7 +103,7 @@
base::DictionaryValue args;
if (parent == tree_model->GetRoot())
- args.Set(kId, base::Value::CreateNullValue());
+ args.Set(kId, base::MakeUnique<base::Value>());
else
args.SetString(kId, model_util_->GetTreeNodeId(parent_node));
args.SetInteger(kStart, start);
@@ -123,7 +124,7 @@
base::DictionaryValue args;
if (parent == tree_model->GetRoot())
- args.Set(kId, base::Value::CreateNullValue());
+ args.Set(kId, base::MakeUnique<base::Value>());
else
args.SetString(kId, model_util_->GetTreeNodeId(tree_model->AsNode(parent)));
args.SetInteger(kStart, start);
@@ -197,8 +198,7 @@
cookies_tree_model_->GetRoot(), base::UTF8ToUTF16(site));
if (!node) {
- RejectJavascriptCallback(base::Value(callback_id_),
- *base::Value::CreateNullValue());
+ RejectJavascriptCallback(base::Value(callback_id_), base::Value());
callback_id_.clear();
return;
}
@@ -255,7 +255,7 @@
base::DictionaryValue args;
if (parent == cookies_tree_model_->GetRoot())
- args.Set(kId, base::Value::CreateNullValue());
+ args.Set(kId, base::MakeUnique<base::Value>());
else
args.SetString(kId, model_util_->GetTreeNodeId(parent));
args.Set(kChildren, std::move(children));
@@ -275,7 +275,7 @@
base::DictionaryValue args;
if (parent == cookies_tree_model_->GetRoot())
- args.Set(kId, base::Value::CreateNullValue());
+ args.Set(kId, base::MakeUnique<base::Value>());
else
args.SetString(kId, model_util_->GetTreeNodeId(parent));
args.Set(kChildren, std::move(children));
diff --git a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
index 02e14062d..28900b3 100644
--- a/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
+++ b/chrome/browser/ui/webui/settings/settings_startup_pages_handler.cc
@@ -131,7 +131,7 @@
CHECK(args->GetInteger(1, &index));
if (index < 0 || index > startup_custom_pages_table_model_.RowCount()) {
- RejectJavascriptCallback(*callback_id, *base::Value::CreateNullValue());
+ RejectJavascriptCallback(*callback_id, base::Value());
NOTREACHED();
return;
}
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc
index 824daae..40e20be 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -576,7 +576,7 @@
}
if (!exceptions->GetSize()) {
- RejectJavascriptCallback(*callback_id, *base::Value::CreateNullValue());
+ RejectJavascriptCallback(*callback_id, base::Value());
return;
}
diff --git a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
index 63e4126..f9ca8953 100644
--- a/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
+++ b/chrome/browser/ui/webui/supervised_user_internals_message_handler.cc
@@ -8,6 +8,7 @@
#include "base/bind.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -245,7 +246,7 @@
const base::DictionaryValue* settings) {
web_ui()->CallJavascriptFunctionUnsafe(
"chrome.supervised_user_internals.receiveUserSettings",
- *(settings ? settings : base::Value::CreateNullValue().get()));
+ *(settings ? settings : base::MakeUnique<base::Value>().get()));
}
void SupervisedUserInternalsMessageHandler::OnTryURLResult(
diff --git a/chrome/test/chromedriver/capabilities_unittest.cc b/chrome/test/chromedriver/capabilities_unittest.cc
index a1a3e7f..32fcd26 100644
--- a/chrome/test/chromedriver/capabilities_unittest.cc
+++ b/chrome/test/chromedriver/capabilities_unittest.cc
@@ -4,6 +4,7 @@
#include "chrome/test/chromedriver/capabilities.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/test/chromedriver/chrome/log.h"
#include "chrome/test/chromedriver/chrome/status.h"
@@ -304,8 +305,8 @@
base::DictionaryValue proxy;
proxy.SetString("proxyType", "manual");
proxy.SetString("ftpProxy", "localhost:9001");
- proxy.Set("sslProxy", base::Value::CreateNullValue());
- proxy.Set("noProxy", base::Value::CreateNullValue());
+ proxy.Set("sslProxy", base::MakeUnique<base::Value>());
+ proxy.Set("noProxy", base::MakeUnique<base::Value>());
base::DictionaryValue caps;
caps.Set("proxy", proxy.DeepCopy());
Status status = capabilities.Parse(caps);
diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
index c55d722..219427c 100644
--- a/chrome/test/chromedriver/chrome/web_view_impl.cc
+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
@@ -11,6 +11,7 @@
#include "base/files/file_path.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/threading/platform_thread.h"
@@ -834,7 +835,7 @@
return Status(kUnknownError, "Runtime.evaluate missing string 'type'");
if (type == "undefined") {
- *result = base::Value::CreateNullValue();
+ *result = base::MakeUnique<base::Value>();
} else {
base::Value* value;
if (!temp_result->Get("value", &value))
diff --git a/chrome/test/chromedriver/commands_unittest.cc b/chrome/test/chromedriver/commands_unittest.cc
index 6e228614..488bc45c 100644
--- a/chrome/test/chromedriver/commands_unittest.cc
+++ b/chrome/test/chromedriver/commands_unittest.cc
@@ -372,7 +372,7 @@
}
case kElementNotExistsQueryOnce: {
if (only_one_)
- result_ = base::Value::CreateNullValue();
+ result_ = base::MakeUnique<base::Value>();
else
result_.reset(new base::ListValue());
break;
@@ -407,7 +407,7 @@
(scenario_ == kElementExistsQueryTwice && current_count_ == 1)) {
// Always return empty result when testing timeout.
if (only_one_)
- *result = base::Value::CreateNullValue();
+ *result = base::MakeUnique<base::Value>();
else
result->reset(new base::ListValue());
} else {
diff --git a/chrome/test/chromedriver/server/http_handler.cc b/chrome/test/chromedriver/server/http_handler.cc
index af0c443..972e4693 100644
--- a/chrome/test/chromedriver/server/http_handler.cc
+++ b/chrome/test/chromedriver/server/http_handler.cc
@@ -15,6 +15,7 @@
#include "base/json/json_writer.h"
#include "base/logging.h" // For CHECK macros.
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -756,7 +757,7 @@
value.reset(error.release());
}
if (!value)
- value = base::Value::CreateNullValue();
+ value = base::MakeUnique<base::Value>();
base::DictionaryValue body_params;
body_params.SetInteger("status", status.code());
@@ -819,7 +820,7 @@
}
if (!value)
- value = base::Value::CreateNullValue();
+ value = base::MakeUnique<base::Value>();
base::DictionaryValue body_params;
if (status.IsError()){
diff --git a/components/arc/bluetooth/bluetooth_type_converters.cc b/components/arc/bluetooth/bluetooth_type_converters.cc
index 33b1a9f..03cbd21f 100644
--- a/components/arc/bluetooth/bluetooth_type_converters.cc
+++ b/components/arc/bluetooth/bluetooth_type_converters.cc
@@ -127,7 +127,7 @@
switch (result->type) {
case bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE:
- result->value.Append(base::Value::CreateNullValue());
+ result->value.Append(base::MakeUnique<base::Value>());
break;
case bluez::BluetoothServiceAttributeValueBlueZ::UINT:
case bluez::BluetoothServiceAttributeValueBlueZ::INT:
@@ -142,7 +142,7 @@
if (depth + 1 >= arc::kBluetoothSDPMaxDepth) {
result->type = bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE;
result->type_size = 0;
- result->value.Append(base::Value::CreateNullValue());
+ result->value.Append(base::MakeUnique<base::Value>());
return result;
}
for (const auto& child : attr_bluez.sequence()) {
@@ -177,7 +177,7 @@
if (attr->value.GetSize() != 1) {
return bluez::BluetoothServiceAttributeValueBlueZ(
bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE, 0,
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
}
std::unique_ptr<base::Value> value;
@@ -190,7 +190,7 @@
if (depth + 1 >= arc::kBluetoothSDPMaxDepth || attr->sequence.empty()) {
return bluez::BluetoothServiceAttributeValueBlueZ(
bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE, 0,
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
}
auto bluez_sequence = base::MakeUnique<
@@ -207,7 +207,7 @@
}
return bluez::BluetoothServiceAttributeValueBlueZ(
bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE, 0,
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
}
// static
diff --git a/components/arc/bluetooth/bluetooth_type_converters_unittest.cc b/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
index 7971556..45c0106c 100644
--- a/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
+++ b/components/arc/bluetooth/bluetooth_type_converters_unittest.cc
@@ -114,7 +114,7 @@
nulltypeAttributeMojo->type =
bluez::BluetoothServiceAttributeValueBlueZ::NULLTYPE;
nulltypeAttributeMojo->type_size = 0;
- nulltypeAttributeMojo->value.Append(base::Value::CreateNullValue());
+ nulltypeAttributeMojo->value.Append(base::MakeUnique<base::Value>());
auto nulltypeAttributeBlueZ =
nulltypeAttributeMojo.To<bluez::BluetoothServiceAttributeValueBlueZ>();
@@ -287,7 +287,7 @@
auto sequenceNoData = arc::mojom::BluetoothSdpAttribute::New();
sequenceNoData->type = bluez::BluetoothServiceAttributeValueBlueZ::SEQUENCE;
sequenceNoData->type_size = 0;
- sequenceNoData->value.Append(base::Value::CreateNullValue());
+ sequenceNoData->value.Append(base::MakeUnique<base::Value>());
auto sequenceNoDataBlueZ =
sequenceNoData.To<bluez::BluetoothServiceAttributeValueBlueZ>();
diff --git a/components/dom_distiller/content/browser/distiller_page_web_contents.cc b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
index f062063..0ac8f7c 100644
--- a/components/dom_distiller/content/browser/distiller_page_web_contents.cc
+++ b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/callback.h"
+#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/utf_string_conversions.h"
#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
@@ -168,7 +169,7 @@
content::WebContentsObserver::Observe(NULL);
DCHECK(state_ == LOADING_PAGE || state_ == EXECUTING_JAVASCRIPT);
state_ = PAGELOAD_FAILED;
- std::unique_ptr<base::Value> empty = base::Value::CreateNullValue();
+ auto empty = base::MakeUnique<base::Value>();
OnWebContentsDistillationDone(GURL(), base::TimeTicks(), empty.get());
}
}
diff --git a/components/dom_distiller/core/distiller_unittest.cc b/components/dom_distiller/core/distiller_unittest.cc
index b7eaf9b..1336d7e 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -17,6 +17,7 @@
#include "base/bind_helpers.h"
#include "base/location.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
@@ -533,7 +534,7 @@
TEST_F(DistillerTest, SinglePageDistillationFailure) {
base::MessageLoopForUI loop;
// To simulate failure return a null value.
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
distiller_.reset(
new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
DistillPage(kURL, CreateMockDistillerPage(null_value.get(), GURL(kURL)));
@@ -555,7 +556,7 @@
distiller_data->distilled_values.begin() + failed_page_num);
distiller_data->distilled_values.insert(
distiller_data->distilled_values.begin() + failed_page_num,
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
// Expect only calls till the failed page number.
distiller_.reset(
new DistillerImpl(url_fetcher_factory_, DomDistillerOptions()));
diff --git a/components/dom_distiller/ios/distiller_page_ios.mm b/components/dom_distiller/ios/distiller_page_ios.mm
index 04bfd90..1b19a6f 100644
--- a/components/dom_distiller/ios/distiller_page_ios.mm
+++ b/components/dom_distiller/ios/distiller_page_ios.mm
@@ -66,7 +66,7 @@
result.reset(new base::Value(static_cast<bool>([wk_result boolValue])));
DCHECK(result->IsType(base::Value::Type::BOOLEAN));
} else if (result_type == CFNullGetTypeID()) {
- result = base::Value::CreateNullValue();
+ result = base::MakeUnique<base::Value>();
DCHECK(result->IsType(base::Value::Type::NONE));
} else if (result_type == CFDictionaryGetTypeID()) {
std::unique_ptr<base::DictionaryValue> dictionary =
@@ -232,7 +232,7 @@
}
void DistillerPageIOS::HandleJavaScriptResult(id result) {
- std::unique_ptr<base::Value> resultValue = base::Value::CreateNullValue();
+ auto resultValue = base::MakeUnique<base::Value>();
if (result) {
resultValue = ValueResultFromScriptResult(result);
}
diff --git a/components/history/core/browser/top_sites_impl.cc b/components/history/core/browser/top_sites_impl.cc
index b9ae715..72378e29 100644
--- a/components/history/core/browser/top_sites_impl.cc
+++ b/components/history/core/browser/top_sites_impl.cc
@@ -14,6 +14,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/md5.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted_memory.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
@@ -291,7 +292,7 @@
void TopSitesImpl::AddBlacklistedURL(const GURL& url) {
DCHECK(thread_checker_.CalledOnValidThread());
- std::unique_ptr<base::Value> dummy = base::Value::CreateNullValue();
+ auto dummy = base::MakeUnique<base::Value>();
{
DictionaryPrefUpdate update(pref_service_, kMostVisitedURLsBlacklist);
base::DictionaryValue* blacklist = update.Get();
diff --git a/components/json_schema/json_schema_validator_unittest_base.cc b/components/json_schema/json_schema_validator_unittest_base.cc
index 1208c12..d96544c 100644
--- a/components/json_schema/json_schema_validator_unittest_base.cc
+++ b/components/json_schema/json_schema_validator_unittest_base.cc
@@ -152,7 +152,7 @@
ExpectNotValid(
TEST_SOURCE, std::unique_ptr<base::Value>(new base::Value("42")).get(),
schema.get(), NULL, std::string(), JSONSchemaValidator::kInvalidEnum);
- ExpectNotValid(TEST_SOURCE, base::Value::CreateNullValue().get(),
+ ExpectNotValid(TEST_SOURCE, base::MakeUnique<base::Value>().get(),
schema.get(), NULL, std::string(),
JSONSchemaValidator::kInvalidEnum);
}
@@ -161,7 +161,7 @@
std::unique_ptr<base::DictionaryValue> schema(
LoadDictionary("choices_schema.json"));
- ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
+ ExpectValid(TEST_SOURCE, base::MakeUnique<base::Value>().get(), schema.get(),
NULL);
ExpectValid(TEST_SOURCE,
std::unique_ptr<base::Value>(new base::Value(42)).get(),
@@ -286,7 +286,7 @@
ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
instance->Remove("bar", NULL);
ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
- instance->Set("bar", base::Value::CreateNullValue());
+ instance->Set("bar", base::MakeUnique<base::Value>());
ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL,
"bar", JSONSchemaValidator::FormatErrorMessage(
JSONSchemaValidator::kInvalidType,
@@ -433,7 +433,7 @@
ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
// TODO(aa): I think this is inconsistent with the handling of NULL+optional
// for objects.
- instance->Set(0, base::Value::CreateNullValue());
+ instance->Set(0, base::MakeUnique<base::Value>());
ExpectValid(TEST_SOURCE, instance.get(), schema.get(), NULL);
instance->Set(0, new base::Value(42));
ExpectNotValid(TEST_SOURCE, instance.get(), schema.get(), NULL, "0",
@@ -604,7 +604,7 @@
std::unique_ptr<base::Value>(new base::DictionaryValue()).get()));
EXPECT_EQ(std::string(schema::kNull),
JSONSchemaValidator::GetJSONSchemaType(
- base::Value::CreateNullValue().get()));
+ base::MakeUnique<base::Value>().get()));
}
void JSONSchemaValidatorTestBase::TestTypes() {
@@ -670,7 +670,7 @@
schema.get(), NULL);
schema->SetString(schema::kType, schema::kNull);
- ExpectValid(TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(),
+ ExpectValid(TEST_SOURCE, base::MakeUnique<base::Value>().get(), schema.get(),
NULL);
// not valid
@@ -683,7 +683,7 @@
schema->SetString(schema::kType, schema::kObject);
ExpectNotValid(
- TEST_SOURCE, base::Value::CreateNullValue().get(), schema.get(), NULL,
+ TEST_SOURCE, base::MakeUnique<base::Value>().get(), schema.get(), NULL,
std::string(),
JSONSchemaValidator::FormatErrorMessage(JSONSchemaValidator::kInvalidType,
schema::kObject, schema::kNull));
diff --git a/components/policy/core/browser/android/policy_converter.cc b/components/policy/core/browser/android/policy_converter.cc
index 9460fa2..c775a96 100644
--- a/components/policy/core/browser/android/policy_converter.cc
+++ b/components/policy/core/browser/android/policy_converter.cc
@@ -113,7 +113,7 @@
switch (schema.type()) {
case base::Value::Type::NONE:
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
case base::Value::Type::BOOLEAN: {
std::string string_value;
diff --git a/components/policy/core/common/mac_util.cc b/components/policy/core/common/mac_util.cc
index 04167e00..911453d 100644
--- a/components/policy/core/common/mac_util.cc
+++ b/components/policy/core/common/mac_util.cc
@@ -8,6 +8,7 @@
#include <utility>
#include "base/mac/foundation_util.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/sys_string_conversions.h"
#include "base/values.h"
@@ -46,7 +47,7 @@
std::unique_ptr<base::Value> PropertyToValue(CFPropertyListRef property) {
if (CFCast<CFNullRef>(property))
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
if (CFBooleanRef boolean = CFCast<CFBooleanRef>(property)) {
return std::unique_ptr<base::Value>(
diff --git a/components/policy/core/common/mac_util_unittest.cc b/components/policy/core/common/mac_util_unittest.cc
index b96e298..c25610b 100644
--- a/components/policy/core/common/mac_util_unittest.cc
+++ b/components/policy/core/common/mac_util_unittest.cc
@@ -9,6 +9,7 @@
#include <memory>
#include "base/mac/scoped_cftyperef.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "components/policy/core/common/policy_test_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -19,7 +20,7 @@
base::DictionaryValue root;
// base::Value::Type::NONE
- root.Set("null", base::Value::CreateNullValue());
+ root.Set("null", base::MakeUnique<base::Value>());
// base::Value::Type::BOOLEAN
root.SetBoolean("false", false);
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index df67893..db72ac7 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -902,7 +902,7 @@
"}"));
base::DictionaryValue policy;
- policy.Set("null", base::Value::CreateNullValue());
+ policy.Set("null", base::MakeUnique<base::Value>());
policy.SetBoolean("bool", true);
policy.SetInteger("int", -123);
policy.SetDouble("double", 456.78e9);
diff --git a/components/policy/core/common/registry_dict.cc b/components/policy/core/common/registry_dict.cc
index 29c9df7..f421904 100644
--- a/components/policy/core/common/registry_dict.cc
+++ b/components/policy/core/common/registry_dict.cc
@@ -76,7 +76,7 @@
int int_value = 0;
switch (schema.type()) {
case base::Value::Type::NONE: {
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
}
case base::Value::Type::BOOLEAN: {
// Accept booleans encoded as either string or integer.
diff --git a/components/policy/core/common/schema_map_unittest.cc b/components/policy/core/common/schema_map_unittest.cc
index 5913ee1..b99bc8a 100644
--- a/components/policy/core/common/schema_map_unittest.cc
+++ b/components/policy/core/common/schema_map_unittest.cc
@@ -166,7 +166,7 @@
map.Set("integer", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(1), nullptr);
map.Set("null", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::Value::CreateNullValue(), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(), nullptr);
map.Set("double", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(1.2), nullptr);
base::DictionaryValue dict;
diff --git a/components/policy/core/common/schema_unittest.cc b/components/policy/core/common/schema_unittest.cc
index dd8c0caf..3ebec136 100644
--- a/components/policy/core/common/schema_unittest.cc
+++ b/components/policy/core/common/schema_unittest.cc
@@ -10,6 +10,7 @@
#include <utility>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "components/policy/core/common/schema_internal.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -640,7 +641,7 @@
bundle.Clear();
bundle.SetBoolean("Boolean", true);
bundle.SetInteger("Integer", 123);
- bundle.Set("Null", base::Value::CreateNullValue());
+ bundle.Set("Null", base::MakeUnique<base::Value>());
bundle.Set("Number", new base::Value(3.14));
bundle.SetString("String", "omg");
diff --git a/components/sync_preferences/pref_model_associator_unittest.cc b/components/sync_preferences/pref_model_associator_unittest.cc
index f189891..d9c4f17d 100644
--- a/components/sync_preferences/pref_model_associator_unittest.cc
+++ b/components/sync_preferences/pref_model_associator_unittest.cc
@@ -7,6 +7,7 @@
#include <memory>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/values.h"
#include "components/prefs/scoped_user_pref_update.h"
@@ -133,7 +134,7 @@
}
TEST_F(ListPreferenceMergeTest, ServerNull) {
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
{
ListPrefUpdate update(pref_service_.get(), kListPrefName);
base::ListValue* local_list_value = update.Get();
@@ -255,7 +256,7 @@
}
TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
{
DictionaryPrefUpdate update(pref_service_.get(), kDictionaryPrefName);
base::DictionaryValue* local_dict_value = update.Get();
diff --git a/components/sync_preferences/pref_service_syncable_unittest.cc b/components/sync_preferences/pref_service_syncable_unittest.cc
index 676c5f2..008446b 100644
--- a/components/sync_preferences/pref_service_syncable_unittest.cc
+++ b/components/sync_preferences/pref_service_syncable_unittest.cc
@@ -539,7 +539,7 @@
InitWithNoSyncData();
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
syncer::SyncChangeList list;
list.push_back(MakeRemoteChange(1, kStringPrefName, *null_value,
SyncChange::ACTION_DELETE));
diff --git a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
index 88e27dc5..4b1fbeb 100644
--- a/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
+++ b/content/browser/android/java/gin_java_bridge_dispatcher_host.cc
@@ -330,7 +330,7 @@
DCHECK(routing_id != MSG_ROUTING_NONE);
scoped_refptr<GinJavaBoundObject> object = FindObject(object_id);
if (!object.get()) {
- wrapped_result->Append(base::Value::CreateNullValue());
+ wrapped_result->Append(base::MakeUnique<base::Value>());
*error_code = kGinJavaBridgeUnknownObjectId;
return;
}
@@ -360,7 +360,7 @@
GinJavaBridgeValue::CreateObjectIDValue(
returned_object_id).release());
} else {
- wrapped_result->Append(base::Value::CreateNullValue());
+ wrapped_result->Append(base::MakeUnique<base::Value>());
}
}
diff --git a/content/browser/android/java/gin_java_bridge_message_filter.cc b/content/browser/android/java/gin_java_bridge_message_filter.cc
index dd45d0a..2506d0d 100644
--- a/content/browser/android/java/gin_java_bridge_message_filter.cc
+++ b/content/browser/android/java/gin_java_bridge_message_filter.cc
@@ -5,6 +5,7 @@
#include "content/browser/android/java/gin_java_bridge_message_filter.h"
#include "base/auto_reset.h"
+#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "content/browser/android/java/gin_java_bridge_dispatcher_host.h"
#include "content/browser/android/java/java_bridge_thread.h"
@@ -155,7 +156,7 @@
host->OnInvokeMethod(current_routing_id_, object_id, method_name, arguments,
wrapped_result, error_code);
} else {
- wrapped_result->Append(base::Value::CreateNullValue());
+ wrapped_result->Append(base::MakeUnique<base::Value>());
*error_code = kGinJavaBridgeRenderFrameDeleted;
}
}
diff --git a/content/browser/android/java/gin_java_method_invocation_helper.cc b/content/browser/android/java/gin_java_method_invocation_helper.cc
index e6b90a7e0..b4a3013 100644
--- a/content/browser/android/java/gin_java_method_invocation_helper.cc
+++ b/content/browser/android/java/gin_java_method_invocation_helper.cc
@@ -11,6 +11,7 @@
#include "base/android/event_log.h"
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
+#include "base/memory/ptr_util.h"
#include "content/browser/android/java/gin_java_script_to_java_types_coercion.h"
#include "content/browser/android/java/java_method.h"
#include "content/browser/android/java/jni_helper.h"
@@ -325,7 +326,7 @@
}
ScopedJavaLocalRef<jobject> scoped_java_object(env, java_object);
if (!scoped_java_object.obj()) {
- result_wrapper.Append(base::Value::CreateNullValue());
+ result_wrapper.Append(base::MakeUnique<base::Value>());
break;
}
SetObjectResult(scoped_java_object, object_->GetSafeAnnotationClass());
diff --git a/content/browser/android/java/gin_java_script_to_java_types_coercion.cc b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
index afc7143..a7fdc62 100644
--- a/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
+++ b/content/browser/android/java/gin_java_script_to_java_types_coercion.cc
@@ -11,6 +11,7 @@
#include "base/android/jni_android.h"
#include "base/android/jni_string.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -465,7 +466,7 @@
if (!result) {
return NULL;
}
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
for (jsize i = 0; i < length; ++i) {
const base::Value* value_element = null_value.get();
list_value->Get(i, &value_element);
@@ -537,7 +538,7 @@
if (!result) {
return NULL;
}
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
for (jsize i = 0; i < length; ++i) {
const std::string key(base::IntToString(i));
const base::Value* value_element = null_value.get();
diff --git a/content/browser/devtools/protocol_string.cc b/content/browser/devtools/protocol_string.cc
index 994e478..3d24afdd 100644
--- a/content/browser/devtools/protocol_string.cc
+++ b/content/browser/devtools/protocol_string.cc
@@ -74,7 +74,7 @@
if (!value || !depth)
return nullptr;
if (value->type() == protocol::Value::TypeNull)
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
if (value->type() == protocol::Value::TypeBoolean) {
bool inner;
value->asBoolean(&inner);
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index 10a9517..da9bf2e 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -247,7 +247,7 @@
info->Set("basic_info", basic_info);
#if defined(OS_WIN)
- std::unique_ptr<base::Value> dx_info = base::Value::CreateNullValue();
+ auto dx_info = base::MakeUnique<base::Value>();
if (gpu_info.dx_diagnostics.children.size())
dx_info.reset(DxDiagNodeToList(gpu_info.dx_diagnostics));
info->Set("diagnostics", std::move(dx_info));
diff --git a/content/child/v8_value_converter_impl.cc b/content/child/v8_value_converter_impl.cc
index b445760f..1391adf 100644
--- a/content/child/v8_value_converter_impl.cc
+++ b/content/child/v8_value_converter_impl.cc
@@ -358,7 +358,7 @@
return nullptr;
if (val->IsNull())
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
if (val->IsBoolean())
return base::MakeUnique<base::Value>(val->ToBoolean(isolate)->Value());
@@ -442,7 +442,7 @@
v8::Isolate* isolate) const {
ScopedUniquenessGuard uniqueness_guard(state, val);
if (!uniqueness_guard.is_valid())
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
std::unique_ptr<v8::Context::Scope> scope;
// If val was created in a different context than our current one, change to
@@ -475,7 +475,7 @@
}
if (!val->HasRealIndexedProperty(i)) {
- result->Append(base::Value::CreateNullValue());
+ result->Append(base::MakeUnique<base::Value>());
continue;
}
@@ -486,7 +486,7 @@
else
// JSON.stringify puts null in places where values don't serialize, for
// example undefined and functions. Emulate that behavior.
- result->Append(base::Value::CreateNullValue());
+ result->Append(base::MakeUnique<base::Value>());
}
return std::move(result);
}
@@ -522,7 +522,7 @@
v8::Isolate* isolate) const {
ScopedUniquenessGuard uniqueness_guard(state, val);
if (!uniqueness_guard.is_valid())
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
std::unique_ptr<v8::Context::Scope> scope;
// If val was created in a different context than our current one, change to
diff --git a/content/child/v8_value_converter_impl_unittest.cc b/content/child/v8_value_converter_impl_unittest.cc
index 2997770e..394af66 100644
--- a/content/child/v8_value_converter_impl_unittest.cc
+++ b/content/child/v8_value_converter_impl_unittest.cc
@@ -814,7 +814,7 @@
// The first repetition should be trimmed and replaced by a null value.
base::ListValue expected_list;
- expected_list.Append(base::Value::CreateNullValue());
+ expected_list.Append(base::MakeUnique<base::Value>());
// The actual result.
std::unique_ptr<base::Value> actual_list(
@@ -835,7 +835,7 @@
// The first repetition should be trimmed and replaced by a null value.
base::DictionaryValue expected_dictionary;
- expected_dictionary.Set(key, base::Value::CreateNullValue());
+ expected_dictionary.Set(key, base::MakeUnique<base::Value>());
// The actual result.
std::unique_ptr<base::Value> actual_dictionary(
diff --git a/content/common/common_param_traits_unittest.cc b/content/common/common_param_traits_unittest.cc
index c5acf22..c9006cf 100644
--- a/content/common/common_param_traits_unittest.cc
+++ b/content/common/common_param_traits_unittest.cc
@@ -11,6 +11,7 @@
#include <utility>
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "content/public/common/content_constants.h"
#include "ipc/ipc_message.h"
@@ -84,7 +85,7 @@
base::ListValue input;
input.Set(0, new base::Value(42.42));
input.Set(1, new base::Value("forty"));
- input.Set(2, base::Value::CreateNullValue());
+ input.Set(2, base::MakeUnique<base::Value>());
IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
IPC::WriteParam(&msg, input);
@@ -104,7 +105,7 @@
TEST(IPCMessageTest, DictionaryValue) {
base::DictionaryValue input;
- input.Set("null", base::Value::CreateNullValue());
+ input.Set("null", base::MakeUnique<base::Value>());
input.Set("bool", new base::Value(true));
input.Set("int", new base::Value(42));
diff --git a/content/renderer/java/gin_java_function_invocation_helper.cc b/content/renderer/java/gin_java_function_invocation_helper.cc
index 9bdf744..af300a2 100644
--- a/content/renderer/java/gin_java_function_invocation_helper.cc
+++ b/content/renderer/java/gin_java_function_invocation_helper.cc
@@ -4,6 +4,7 @@
#include "content/renderer/java/gin_java_function_invocation_helper.h"
+#include "base/memory/ptr_util.h"
#include "content/common/android/gin_java_bridge_errors.h"
#include "content/common/android/gin_java_bridge_value.h"
#include "content/public/child/v8_value_converter.h"
@@ -65,7 +66,7 @@
if (arg.get()) {
arguments.Append(arg.release());
} else {
- arguments.Append(base::Value::CreateNullValue());
+ arguments.Append(base::MakeUnique<base::Value>());
}
}
}
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index e8154990..08a77e2 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -2064,10 +2064,10 @@
std::unique_ptr<base::Value> result_value(
converter.FromV8Value(value, context));
list.Append(result_value ? std::move(result_value)
- : base::Value::CreateNullValue());
+ : base::MakeUnique<base::Value>());
}
} else {
- list.Set(0, base::Value::CreateNullValue());
+ list.Set(0, base::MakeUnique<base::Value>());
}
render_frame_impl_.get()->Send(
new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id_, list));
@@ -2092,9 +2092,9 @@
std::unique_ptr<base::Value> result_value(
converter.FromV8Value(result, context));
list.Set(0, result_value ? std::move(result_value)
- : base::Value::CreateNullValue());
+ : base::MakeUnique<base::Value>());
} else {
- list.Set(0, base::Value::CreateNullValue());
+ list.Set(0, base::MakeUnique<base::Value>());
}
Send(new FrameHostMsg_JavaScriptExecuteResponse(routing_id_, id, list));
}
diff --git a/content/renderer/stats_collection_controller.cc b/content/renderer/stats_collection_controller.cc
index c4f4fc93..a86aabeda 100644
--- a/content/renderer/stats_collection_controller.cc
+++ b/content/renderer/stats_collection_controller.cc
@@ -5,6 +5,7 @@
#include "content/renderer/stats_collection_controller.h"
#include "base/json/json_writer.h"
+#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/metrics/statistics_recorder.h"
#include "base/strings/string_util.h"
@@ -55,13 +56,13 @@
base::DictionaryValue item;
if (load_start_time.is_null()) {
- item.Set("load_start_ms", base::Value::CreateNullValue());
+ item.Set("load_start_ms", base::MakeUnique<base::Value>());
} else {
item.SetDouble("load_start_ms", (load_start_time - base::Time::UnixEpoch())
.InMillisecondsF());
}
if (load_start_time.is_null() || load_stop_time.is_null()) {
- item.Set("load_duration_ms", base::Value::CreateNullValue());
+ item.Set("load_duration_ms", base::MakeUnique<base::Value>());
} else {
item.SetDouble("load_duration_ms",
(load_stop_time - load_start_time).InMillisecondsF());
diff --git a/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez.cc b/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez.cc
index ee6cbf61..2c484c1 100644
--- a/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez.cc
+++ b/device/bluetooth/bluez/bluetooth_service_attribute_value_bluez.cc
@@ -12,7 +12,7 @@
namespace bluez {
BluetoothServiceAttributeValueBlueZ::BluetoothServiceAttributeValueBlueZ()
- : type_(NULLTYPE), size_(0), value_(base::Value::CreateNullValue()) {}
+ : type_(NULLTYPE), size_(0), value_(base::MakeUnique<base::Value>()) {}
BluetoothServiceAttributeValueBlueZ::BluetoothServiceAttributeValueBlueZ(
Type type,
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc
index 4ec4435..e64c272 100644
--- a/extensions/browser/api/socket/socket_api.cc
+++ b/extensions/browser/api/socket/socket_api.cc
@@ -362,7 +362,7 @@
socket->Disconnect(false /* socket_destroying */);
else
error_ = kSocketNotFoundError;
- SetResult(base::Value::CreateNullValue());
+ SetResult(base::MakeUnique<base::Value>());
}
bool SocketBindFunction::Prepare() {
diff --git a/extensions/browser/app_window/app_window.cc b/extensions/browser/app_window/app_window.cc
index 83f0748..bdaa185 100644
--- a/extensions/browser/app_window/app_window.cc
+++ b/extensions/browser/app_window/app_window.cc
@@ -81,7 +81,7 @@
if (value != SizeConstraints::kUnboundedSize)
bounds_properties->SetInteger(name, value);
else
- bounds_properties->Set(name, base::Value::CreateNullValue());
+ bounds_properties->Set(name, base::MakeUnique<base::Value>());
}
void SetBoundsProperties(const gfx::Rect& bounds,
diff --git a/extensions/common/permissions/manifest_permission_set_unittest.cc b/extensions/common/permissions/manifest_permission_set_unittest.cc
index e0da1af..bc20772 100644
--- a/extensions/common/permissions/manifest_permission_set_unittest.cc
+++ b/extensions/common/permissions/manifest_permission_set_unittest.cc
@@ -2,10 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "extensions/common/permissions/manifest_permission_set.h"
+
+#include "base/memory/ptr_util.h"
#include "base/pickle.h"
#include "base/values.h"
#include "extensions/common/permissions/manifest_permission.h"
-#include "extensions/common/permissions/manifest_permission_set.h"
#include "ipc/ipc_message.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -26,7 +28,7 @@
bool FromValue(const base::Value* value) override { return true; }
std::unique_ptr<base::Value> ToValue() const override {
- return base::Value::CreateNullValue();
+ return base::MakeUnique<base::Value>();
}
ManifestPermission* Diff(const ManifestPermission* rhs) const override {
diff --git a/extensions/renderer/api_signature.cc b/extensions/renderer/api_signature.cc
index 733ec8ed..d334234 100644
--- a/extensions/renderer/api_signature.cc
+++ b/extensions/renderer/api_signature.cc
@@ -132,7 +132,7 @@
private:
void AddNull() override {
- list_value_->Append(base::Value::CreateNullValue());
+ list_value_->Append(base::MakeUnique<base::Value>());
}
void AddNullCallback() override {
// The base::Value conversion doesn't include the callback directly, so we
diff --git a/extensions/renderer/script_injection.cc b/extensions/renderer/script_injection.cc
index 0ee36ff2..d4861919 100644
--- a/extensions/renderer/script_injection.cc
+++ b/extensions/renderer/script_injection.cc
@@ -9,6 +9,7 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/timer/elapsed_timer.h"
#include "base/values.h"
@@ -363,7 +364,7 @@
execution_result_ = v8_converter->FromV8Value(results[0], context);
}
if (!execution_result_.get())
- execution_result_ = base::Value::CreateNullValue();
+ execution_result_ = base::MakeUnique<base::Value>();
}
did_inject_js_ = true;
diff --git a/headless/lib/browser/headless_devtools_client_impl.cc b/headless/lib/browser/headless_devtools_client_impl.cc
index ff0c2aa..ca315fa 100644
--- a/headless/lib/browser/headless_devtools_client_impl.cc
+++ b/headless/lib/browser/headless_devtools_client_impl.cc
@@ -129,7 +129,7 @@
if (message_dict.GetDictionary("result", &result_dict)) {
callback.callback_with_result.Run(*result_dict);
} else if (message_dict.GetDictionary("error", &result_dict)) {
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
DLOG(ERROR) << "Error in method call result: " << *result_dict;
callback.callback_with_result.Run(*null_value);
} else {
diff --git a/ios/web/web_state/ui/web_view_js_utils.mm b/ios/web/web_state/ui/web_view_js_utils.mm
index b7aade32..1afe2d8 100644
--- a/ios/web/web_state/ui/web_view_js_utils.mm
+++ b/ios/web/web_state/ui/web_view_js_utils.mm
@@ -41,7 +41,7 @@
result.reset(new base::Value(static_cast<bool>([wk_result boolValue])));
DCHECK(result->IsType(base::Value::Type::BOOLEAN));
} else if (result_type == CFNullGetTypeID()) {
- result = base::Value::CreateNullValue();
+ result = base::MakeUnique<base::Value>();
DCHECK(result->IsType(base::Value::Type::NONE));
} else if (result_type == CFDictionaryGetTypeID()) {
std::unique_ptr<base::DictionaryValue> dictionary =
diff --git a/ipc/ipc_message_unittest.cc b/ipc/ipc_message_unittest.cc
index fd08452..1bf52d8 100644
--- a/ipc/ipc_message_unittest.cc
+++ b/ipc/ipc_message_unittest.cc
@@ -11,6 +11,7 @@
#include <limits>
#include <memory>
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -67,7 +68,7 @@
base::ListValue input;
input.Set(0, new base::Value(42.42));
input.Set(1, new base::Value("forty"));
- input.Set(2, base::Value::CreateNullValue());
+ input.Set(2, base::MakeUnique<base::Value>());
IPC::Message msg(1, 2, IPC::Message::PRIORITY_NORMAL);
IPC::WriteParam(&msg, input);
@@ -87,7 +88,7 @@
TEST(IPCMessageTest, DictionaryValue) {
base::DictionaryValue input;
- input.Set("null", base::Value::CreateNullValue());
+ input.Set("null", base::MakeUnique<base::Value>());
input.Set("bool", new base::Value(true));
input.Set("int", new base::Value(42));
input.SetWithoutPathExpansion("int.with.dot", new base::Value(43));
diff --git a/ipc/ipc_message_utils.cc b/ipc/ipc_message_utils.cc
index bf8daa5..9ef571ff 100644
--- a/ipc/ipc_message_utils.cc
+++ b/ipc/ipc_message_utils.cc
@@ -262,8 +262,8 @@
switch (static_cast<base::Value::Type>(type)) {
case base::Value::Type::NONE:
- *value = base::Value::CreateNullValue().release();
- break;
+ *value = new base::Value();
+ break;
case base::Value::Type::BOOLEAN: {
bool val;
if (!ReadParam(m, iter, &val))
diff --git a/ipc/ipc_message_utils_unittest.cc b/ipc/ipc_message_utils_unittest.cc
index 36b0dbd..4a10d34e 100644
--- a/ipc/ipc_message_utils_unittest.cc
+++ b/ipc/ipc_message_utils_unittest.cc
@@ -10,6 +10,7 @@
#include "base/files/file_path.h"
#include "base/json/json_reader.h"
+#include "base/memory/ptr_util.h"
#include "base/unguessable_token.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/ipc_message.h"
@@ -100,7 +101,7 @@
value->SetWithoutPathExpansion("foo", new base::Value(42));
value->SetWithoutPathExpansion("bar", new base::Value(3.14));
value->SetWithoutPathExpansion("baz", new base::Value("hello"));
- value->SetWithoutPathExpansion("qux", base::Value::CreateNullValue());
+ value->SetWithoutPathExpansion("qux", base::MakeUnique<base::Value>());
std::unique_ptr<base::DictionaryValue> nested_dict(new base::DictionaryValue);
nested_dict->SetWithoutPathExpansion("foobar", new base::Value(5));
diff --git a/media/base/video_frame_unittest.cc b/media/base/video_frame_unittest.cc
index 1d400f6..775245b 100644
--- a/media/base/video_frame_unittest.cc
+++ b/media/base/video_frame_unittest.cc
@@ -12,6 +12,7 @@
#include "base/format_macros.h"
#include "base/macros.h"
#include "base/memory/aligned_memory.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "gpu/command_buffer/common/mailbox_holder.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -539,7 +540,7 @@
metadata.Clear();
EXPECT_FALSE(metadata.HasKey(key));
- metadata.SetValue(key, base::Value::CreateNullValue());
+ metadata.SetValue(key, base::MakeUnique<base::Value>());
EXPECT_TRUE(metadata.HasKey(key));
const base::Value* const null_value = metadata.GetValue(key);
EXPECT_TRUE(null_value);
diff --git a/mojo/common/common_custom_types_unittest.cc b/mojo/common/common_custom_types_unittest.cc
index e3571d9..36fc042 100644
--- a/mojo/common/common_custom_types_unittest.cc
+++ b/mojo/common/common_custom_types_unittest.cc
@@ -274,7 +274,7 @@
ASSERT_TRUE(ptr->BounceValue(nullptr, &output));
EXPECT_FALSE(output);
- std::unique_ptr<base::Value> input = base::Value::CreateNullValue();
+ auto input = base::MakeUnique<base::Value>();
ASSERT_TRUE(ptr->BounceValue(input->CreateDeepCopy(), &output));
EXPECT_TRUE(base::Value::Equals(input.get(), output.get()));
@@ -306,7 +306,7 @@
dict->SetInteger("nested.int", 9);
dict->Set("some_binary",
base::BinaryValue::CreateWithCopiedBuffer("mojo", 4));
- dict->Set("null_value", base::Value::CreateNullValue());
+ dict->Set("null_value", base::MakeUnique<base::Value>());
dict->SetIntegerWithoutPathExpansion("non_nested.int", 10);
{
std::unique_ptr<base::ListValue> dict_list(new base::ListValue());
@@ -328,7 +328,7 @@
list->AppendDouble(42.1);
list->AppendBoolean(true);
list->Append(base::BinaryValue::CreateWithCopiedBuffer("mojo", 4));
- list->Append(base::Value::CreateNullValue());
+ list->Append(base::MakeUnique<base::Value>());
{
std::unique_ptr<base::DictionaryValue> list_dict(
new base::DictionaryValue());
diff --git a/mojo/common/values_struct_traits.cc b/mojo/common/values_struct_traits.cc
index 6af7a395..ef88a09 100644
--- a/mojo/common/values_struct_traits.cc
+++ b/mojo/common/values_struct_traits.cc
@@ -58,7 +58,7 @@
std::unique_ptr<base::Value>* value_out) {
switch (data.tag()) {
case common::mojom::ValueDataView::Tag::NULL_VALUE: {
- *value_out = base::Value::CreateNullValue();
+ *value_out = base::MakeUnique<base::Value>();
return true;
}
case common::mojom::ValueDataView::Tag::BOOL_VALUE: {
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index afc77f3..2f02922 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -14,6 +14,7 @@
#include "base/files/file_util.h"
#include "base/json/json_reader.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/values.h"
#include "net/base/address_list.h"
@@ -535,16 +536,16 @@
arguments->SetString("data-dir", document_root_.value());
if (VLOG_IS_ON(1) || log_to_console_)
- arguments->Set("log-to-console", base::Value::CreateNullValue());
+ arguments->Set("log-to-console", base::MakeUnique<base::Value>());
if (ws_basic_auth_) {
DCHECK(type_ == TYPE_WS || type_ == TYPE_WSS);
- arguments->Set("ws-basic-auth", base::Value::CreateNullValue());
+ arguments->Set("ws-basic-auth", base::MakeUnique<base::Value>());
}
if (no_anonymous_ftp_user_) {
DCHECK_EQ(TYPE_FTP, type_);
- arguments->Set("no-anonymous-ftp-user", base::Value::CreateNullValue());
+ arguments->Set("no-anonymous-ftp-user", base::MakeUnique<base::Value>());
}
if (UsingSSL(type_)) {
@@ -564,7 +565,7 @@
// Check the client certificate related arguments.
if (ssl_options_.request_client_certificate)
- arguments->Set("ssl-client-auth", base::Value::CreateNullValue());
+ arguments->Set("ssl-client-auth", base::MakeUnique<base::Value>());
std::unique_ptr<base::ListValue> ssl_client_certs(new base::ListValue());
std::vector<base::FilePath>::const_iterator it;
@@ -591,11 +592,11 @@
}
if (type_ == TYPE_HTTPS) {
- arguments->Set("https", base::Value::CreateNullValue());
+ arguments->Set("https", base::MakeUnique<base::Value>());
if (ssl_options_.server_certificate ==
SSLOptions::CERT_AUTO_AIA_INTERMEDIATE)
- arguments->Set("aia-intermediate", base::Value::CreateNullValue());
+ arguments->Set("aia-intermediate", base::MakeUnique<base::Value>());
std::string ocsp_arg = ssl_options_.GetOCSPArgument();
if (!ocsp_arg.empty())
@@ -624,14 +625,14 @@
if (bulk_cipher_values->GetSize())
arguments->Set("ssl-bulk-cipher", bulk_cipher_values.release());
if (ssl_options_.record_resume)
- arguments->Set("https-record-resume", base::Value::CreateNullValue());
+ arguments->Set("https-record-resume", base::MakeUnique<base::Value>());
if (ssl_options_.tls_intolerant != SSLOptions::TLS_INTOLERANT_NONE) {
arguments->SetInteger("tls-intolerant", ssl_options_.tls_intolerant);
arguments->Set("tls-intolerance-type", GetTLSIntoleranceType(
ssl_options_.tls_intolerance_type));
}
if (ssl_options_.fallback_scsv_enabled)
- arguments->Set("fallback-scsv", base::Value::CreateNullValue());
+ arguments->Set("fallback-scsv", base::MakeUnique<base::Value>());
if (!ssl_options_.signed_cert_timestamps_tls_ext.empty()) {
std::string b64_scts_tls_ext;
base::Base64Encode(ssl_options_.signed_cert_timestamps_tls_ext,
@@ -639,10 +640,10 @@
arguments->SetString("signed-cert-timestamps-tls-ext", b64_scts_tls_ext);
}
if (ssl_options_.staple_ocsp_response)
- arguments->Set("staple-ocsp-response", base::Value::CreateNullValue());
+ arguments->Set("staple-ocsp-response", base::MakeUnique<base::Value>());
if (ssl_options_.ocsp_server_unavailable) {
arguments->Set("ocsp-server-unavailable",
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
}
if (!ssl_options_.alpn_protocols.empty()) {
std::unique_ptr<base::ListValue> alpn_protocols(new base::ListValue());
@@ -659,13 +660,13 @@
arguments->Set("npn-protocols", std::move(npn_protocols));
}
if (ssl_options_.alert_after_handshake)
- arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
+ arguments->Set("alert-after-handshake", base::MakeUnique<base::Value>());
if (ssl_options_.disable_channel_id)
- arguments->Set("disable-channel-id", base::Value::CreateNullValue());
+ arguments->Set("disable-channel-id", base::MakeUnique<base::Value>());
if (ssl_options_.disable_extended_master_secret) {
arguments->Set("disable-extended-master-secret",
- base::Value::CreateNullValue());
+ base::MakeUnique<base::Value>());
}
if (!ssl_options_.supported_token_binding_params.empty()) {
std::unique_ptr<base::ListValue> token_binding_params(
diff --git a/net/test/spawned_test_server/remote_test_server.cc b/net/test/spawned_test_server/remote_test_server.cc
index 17dc21e..90ec54e5 100644
--- a/net/test/spawned_test_server/remote_test_server.cc
+++ b/net/test/spawned_test_server/remote_test_server.cc
@@ -15,6 +15,7 @@
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/logging.h"
+#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
@@ -127,7 +128,7 @@
if (!GenerateArguments(&arguments_dict))
return false;
- arguments_dict.Set("on-remote-server", base::Value::CreateNullValue());
+ arguments_dict.Set("on-remote-server", base::MakeUnique<base::Value>());
// Append the 'server-type' argument which is used by spawner server to
// pass right server type to Python test server.
diff --git a/remoting/host/setup/me2me_native_messaging_host.cc b/remoting/host/setup/me2me_native_messaging_host.cc
index 74844d6..79db06a3 100644
--- a/remoting/host/setup/me2me_native_messaging_host.cc
+++ b/remoting/host/setup/me2me_native_messaging_host.cc
@@ -16,6 +16,7 @@
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/stringize_macros.h"
#include "base/time/time.h"
@@ -457,7 +458,7 @@
if (config) {
response->Set("config", config.release());
} else {
- response->Set("config", base::Value::CreateNullValue());
+ response->Set("config", base::MakeUnique<base::Value>());
}
SendMessageToClient(std::move(response));
}
diff --git a/services/preferences/tracked/pref_hash_calculator_unittest.cc b/services/preferences/tracked/pref_hash_calculator_unittest.cc
index c4ded42..df3746a 100644
--- a/services/preferences/tracked/pref_hash_calculator_unittest.cc
+++ b/services/preferences/tracked/pref_hash_calculator_unittest.cc
@@ -76,7 +76,7 @@
static const char kSeed[] = "0123456789ABCDEF0123456789ABCDEF";
static const char kDeviceId[] = "test_device_id1";
- std::unique_ptr<base::Value> null_value = base::Value::CreateNullValue();
+ auto null_value = base::MakeUnique<base::Value>();
std::unique_ptr<base::Value> bool_value(new base::Value(false));
std::unique_ptr<base::Value> int_value(new base::Value(1234567890));
std::unique_ptr<base::Value> double_value(new base::Value(123.0987654321));
diff --git a/tools/gn/desc_builder.cc b/tools/gn/desc_builder.cc
index c04fad6..965ec92 100644
--- a/tools/gn/desc_builder.cc
+++ b/tools/gn/desc_builder.cc
@@ -122,17 +122,17 @@
}
ValuePtr RenderValue(const std::string& s, bool optional = false) {
- return (s.empty() && optional) ? base::Value::CreateNullValue()
+ return (s.empty() && optional) ? base::MakeUnique<base::Value>()
: ValuePtr(new base::Value(s));
}
ValuePtr RenderValue(const SourceDir& d) {
- return d.is_null() ? base::Value::CreateNullValue()
+ return d.is_null() ? base::MakeUnique<base::Value>()
: ValuePtr(new base::Value(FormatSourceDir(d)));
}
ValuePtr RenderValue(const SourceFile& f) {
- return f.is_null() ? base::Value::CreateNullValue()
+ return f.is_null() ? base::MakeUnique<base::Value>()
: ValuePtr(new base::Value(f.value()));
}
diff --git a/tools/json_schema_compiler/test/error_generation_unittest.cc b/tools/json_schema_compiler/test/error_generation_unittest.cc
index e55ecb9..9c22682 100644
--- a/tools/json_schema_compiler/test/error_generation_unittest.cc
+++ b/tools/json_schema_compiler/test/error_generation_unittest.cc
@@ -100,8 +100,7 @@
EXPECT_TRUE(TestFunction::Params::Create(*params_value, &error));
}
{
- std::unique_ptr<base::ListValue> params_value =
- List(base::Value::CreateNullValue().release());
+ std::unique_ptr<base::ListValue> params_value = List(new Value());
base::string16 error;
EXPECT_FALSE(TestFunction::Params::Create(*params_value, &error));
EXPECT_TRUE(EqualsUtf16("'num' is required", error));
diff --git a/tools/json_schema_compiler/test/simple_api_unittest.cc b/tools/json_schema_compiler/test/simple_api_unittest.cc
index 29d7637..54c773f2 100644
--- a/tools/json_schema_compiler/test/simple_api_unittest.cc
+++ b/tools/json_schema_compiler/test/simple_api_unittest.cc
@@ -4,6 +4,7 @@
#include "tools/json_schema_compiler/test/simple_api.h"
+#include "base/memory/ptr_util.h"
#include "testing/gtest/include/gtest/gtest.h"
using namespace test::api::simple_api;
@@ -77,7 +78,7 @@
TEST(JsonSchemaCompilerSimpleTest, OptionalParamsTakingNull) {
{
std::unique_ptr<base::ListValue> params_value(new base::ListValue());
- params_value->Append(base::Value::CreateNullValue());
+ params_value->Append(base::MakeUnique<base::Value>());
std::unique_ptr<OptionalString::Params> params(
OptionalString::Params::Create(*params_value));
EXPECT_TRUE(params.get());
@@ -98,7 +99,7 @@
TEST(JsonSchemaCompilerSimpleTest, OptionalBeforeRequired) {
{
std::unique_ptr<base::ListValue> params_value(new base::ListValue());
- params_value->Append(base::Value::CreateNullValue());
+ params_value->Append(base::MakeUnique<base::Value>());
params_value->AppendString("asdf");
std::unique_ptr<OptionalBeforeRequired::Params> params(
OptionalBeforeRequired::Params::Create(*params_value));