extensions: Replace base::MakeUnique with std::make_unique
Should use std::make_unique directly instead of using base::MakeUnique
since August[1]. So, this change removes usages of base::MakeUnique in
//chrome/browser/extensions.
This change removes `#include "base/memory/ptr_util.h"` if it's no more
used in files. (Might not remove if base::WrapUnique is used)
This change also adds `#include <memory>` header except the following
two cases:
- Not add the header if the file contains the <memory> header
- Not add the header if the related header contains <memory> header
(The style guide[2] says that foo.cc can rely on foo.h's includes)
Confirmed no additional lint errors(by `git cl lint`) after this change.
[1] https://chromium-review.googlesource.com/c/chromium/src/+/616016
[2] https://google.github.io/styleguide/cppguide.html#Names_and_Order_of_Includes
Bug: 755727
Change-Id: Iad81c59fef2a7b92eb6d27fb891bc8c19643d32d
Reviewed-on: https://chromium-review.googlesource.com/867171
Reviewed-by: Devlin <[email protected]>
Commit-Queue: Jinho Bang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#529852}diff --git a/chrome/browser/extensions/active_tab_apitest.cc b/chrome/browser/extensions/active_tab_apitest.cc
index 7b265d5..b8d3cdd 100644
--- a/chrome/browser/extensions/active_tab_apitest.cc
+++ b/chrome/browser/extensions/active_tab_apitest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/logging.h"
#include "chrome/browser/extensions/extension_action_runner.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -70,7 +72,7 @@
{
// Setup state.
chromeos::ScopedTestPublicSessionLoginState login_state;
- auto delegate = base::MakeUnique<ExtensionTabUtilDelegateChromeOS>();
+ auto delegate = std::make_unique<ExtensionTabUtilDelegateChromeOS>();
ExtensionTabUtil::SetPlatformDelegate(delegate.get());
ExtensionTestMessageListener listener(false);
diff --git a/chrome/browser/extensions/active_tab_unittest.cc b/chrome/browser/extensions/active_tab_unittest.cc
index 52119d59..8ed7348 100644
--- a/chrome/browser/extensions/active_tab_unittest.cc
+++ b/chrome/browser/extensions/active_tab_unittest.cc
@@ -8,7 +8,6 @@
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/values.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -425,7 +424,7 @@
// Test that the custom platform delegate works as expected.
TEST_F(ActiveTabTest, Delegate) {
auto test_delegate =
- base::MakeUnique<ActiveTabPermissionGranterTestDelegate>();
+ std::make_unique<ActiveTabPermissionGranterTestDelegate>();
ActiveTabPermissionGranter::SetPlatformDelegate(test_delegate.get());
GURL google("http://www.google.com");
diff --git a/chrome/browser/extensions/activity_log/activity_log.cc b/chrome/browser/extensions/activity_log/activity_log.cc
index d9c931a8..c8cd03b 100644
--- a/chrome/browser/extensions/activity_log/activity_log.cc
+++ b/chrome/browser/extensions/activity_log/activity_log.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/activity_log/activity_log.h"
#include <stddef.h>
+#include <memory>
#include <set>
#include <utility>
#include <vector>
@@ -14,7 +15,6 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/lock.h"
@@ -280,7 +280,7 @@
if (action->args()->GetString(url_index, &url_string) &&
ResolveUrl(action->page_url(), url_string, &arg_url)) {
action->mutable_args()->Set(
- url_index, base::MakeUnique<base::Value>(kArgUrlPlaceholder));
+ url_index, std::make_unique<base::Value>(kArgUrlPlaceholder));
}
break;
}
@@ -312,7 +312,7 @@
GetUrlForTabId(tab_id, profile, &arg_url, &arg_incognito);
if (arg_url.is_valid()) {
action->mutable_args()->Set(
- url_index, base::MakeUnique<base::Value>(kArgUrlPlaceholder));
+ url_index, std::make_unique<base::Value>(kArgUrlPlaceholder));
}
} else if (action->mutable_args()->GetList(url_index, &tab_list)) {
// A list of possible IDs to translate. Work through in reverse order
@@ -322,13 +322,13 @@
if (tab_list->GetInteger(i, &tab_id) &&
GetUrlForTabId(tab_id, profile, &arg_url, &arg_incognito)) {
if (!arg_incognito)
- tab_list->Set(i, base::MakeUnique<base::Value>(arg_url.spec()));
+ tab_list->Set(i, std::make_unique<base::Value>(arg_url.spec()));
extracted_index = i;
}
}
if (extracted_index >= 0) {
tab_list->Set(extracted_index,
- base::MakeUnique<base::Value>(kArgUrlPlaceholder));
+ std::make_unique<base::Value>(kArgUrlPlaceholder));
}
}
break;
diff --git a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
index c9049b5..d02625b 100644
--- a/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/counting_policy_unittest.cc
@@ -13,7 +13,6 @@
#include "base/cancelable_callback.h"
#include "base/command_line.h"
#include "base/location.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"
@@ -435,8 +434,8 @@
extension_service_->AddExtension(extension.get());
std::unique_ptr<base::ListValue> args(new base::ListValue());
- args->Set(0, base::MakeUnique<base::Value>("hello"));
- args->Set(1, base::MakeUnique<base::Value>("world"));
+ args->Set(0, std::make_unique<base::Value>("hello"));
+ args->Set(1, std::make_unique<base::Value>("world"));
scoped_refptr<Action> action = new Action(extension->id(),
base::Time::Now(),
Action::ACTION_API_CALL,
@@ -587,14 +586,14 @@
base::Time::Now(),
Action::ACTION_API_CALL,
"tabs.testMethod");
- action_api->set_args(base::MakeUnique<base::ListValue>());
+ action_api->set_args(std::make_unique<base::ListValue>());
policy->ProcessAction(action_api);
scoped_refptr<Action> action_dom = new Action(extension->id(),
base::Time::Now(),
Action::ACTION_DOM_ACCESS,
"document.write");
- action_dom->set_args(base::MakeUnique<base::ListValue>());
+ action_dom->set_args(std::make_unique<base::ListValue>());
action_dom->set_page_url(gurl);
policy->ProcessAction(action_dom);
diff --git a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
index b6c65ca9..65175e5 100644
--- a/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
+++ b/chrome/browser/extensions/activity_log/fullstream_ui_policy_unittest.cc
@@ -12,7 +12,6 @@
#include "base/cancelable_callback.h"
#include "base/command_line.h"
#include "base/location.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"
@@ -379,14 +378,14 @@
base::Time::Now(),
Action::ACTION_API_CALL,
"tabs.testMethod");
- action_api->set_args(base::MakeUnique<base::ListValue>());
+ action_api->set_args(std::make_unique<base::ListValue>());
policy->ProcessAction(action_api);
scoped_refptr<Action> action_dom = new Action(extension->id(),
base::Time::Now(),
Action::ACTION_DOM_ACCESS,
"document.write");
- action_dom->set_args(base::MakeUnique<base::ListValue>());
+ action_dom->set_args(std::make_unique<base::ListValue>());
action_dom->set_page_url(gurl);
policy->ProcessAction(action_dom);
@@ -418,14 +417,14 @@
base::Time::Now(),
Action::ACTION_API_CALL,
"tabs.testMethod");
- action_api->set_args(base::MakeUnique<base::ListValue>());
+ action_api->set_args(std::make_unique<base::ListValue>());
policy->ProcessAction(action_api);
scoped_refptr<Action> action_dom = new Action(extension->id(),
base::Time::Now(),
Action::ACTION_DOM_ACCESS,
"document.write");
- action_dom->set_args(base::MakeUnique<base::ListValue>());
+ action_dom->set_args(std::make_unique<base::ListValue>());
action_dom->set_page_url(gurl);
policy->ProcessAction(action_dom);
@@ -512,8 +511,8 @@
extension_service_->AddExtension(extension.get());
std::unique_ptr<base::ListValue> args(new base::ListValue());
- args->Set(0, base::MakeUnique<base::Value>("hello"));
- args->Set(1, base::MakeUnique<base::Value>("world"));
+ args->Set(0, std::make_unique<base::Value>("hello"));
+ args->Set(1, std::make_unique<base::Value>("world"));
scoped_refptr<Action> action = new Action(extension->id(),
base::Time::Now(),
Action::ACTION_API_CALL,
@@ -859,14 +858,14 @@
base::Time::Now(),
Action::ACTION_API_CALL,
"tabs.testMethod");
- action_api->set_args(base::MakeUnique<base::ListValue>());
+ action_api->set_args(std::make_unique<base::ListValue>());
policy->ProcessAction(action_api);
scoped_refptr<Action> action_dom = new Action(extension->id(),
base::Time::Now(),
Action::ACTION_DOM_ACCESS,
"document.write");
- action_dom->set_args(base::MakeUnique<base::ListValue>());
+ action_dom->set_args(std::make_unique<base::ListValue>());
action_dom->set_page_url(gurl);
policy->ProcessAction(action_dom);
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
index cded076..ab0b80c 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.cc
@@ -96,7 +96,7 @@
std::unique_ptr<base::ListValue> value(new base::ListValue());
ExtensionActivity activity_arg = activity->ConvertToExtensionActivity();
value->Append(activity_arg.ToValue());
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::ACTIVITY_LOG_PRIVATE_ON_EXTENSION_ACTIVITY,
activity_log_private::OnExtensionActivity::kEventName, std::move(value),
browser_context_);
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
index e26a1bd..e9b027c 100644
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api_unittest.cc
@@ -8,7 +8,6 @@
#include <string>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/extensions/activity_log/activity_action_constants.h"
@@ -30,8 +29,8 @@
TEST_F(ActivityLogApiUnitTest, ConvertChromeApiAction) {
std::unique_ptr<base::ListValue> args(new base::ListValue());
- args->Set(0, base::MakeUnique<base::Value>("hello"));
- args->Set(1, base::MakeUnique<base::Value>("world"));
+ args->Set(0, std::make_unique<base::Value>("hello"));
+ args->Set(1, std::make_unique<base::Value>("world"));
scoped_refptr<Action> action(new Action(kExtensionId,
base::Time::Now(),
Action::ACTION_API_CALL,
@@ -48,8 +47,8 @@
TEST_F(ActivityLogApiUnitTest, ConvertDomAction) {
std::unique_ptr<base::ListValue> args(new base::ListValue());
- args->Set(0, base::MakeUnique<base::Value>("hello"));
- args->Set(1, base::MakeUnique<base::Value>("world"));
+ args->Set(0, std::make_unique<base::Value>("hello"));
+ args->Set(1, std::make_unique<base::Value>("world"));
scoped_refptr<Action> action(new Action(kExtensionId,
base::Time::Now(),
Action::ACTION_DOM_ACCESS,
diff --git a/chrome/browser/extensions/api/autofill_private/autofill_util.cc b/chrome/browser/extensions/api/autofill_private/autofill_util.cc
index 9bc56f0c..811ff63a 100644
--- a/chrome/browser/extensions/api/autofill_private/autofill_util.cc
+++ b/chrome/browser/extensions/api/autofill_private/autofill_util.cc
@@ -9,7 +9,6 @@
#include <utility>
#include <vector>
-#include "base/memory/ptr_util.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
@@ -63,7 +62,7 @@
std::unique_ptr<std::string> GetStringFromProfile(
const autofill::AutofillProfile& profile,
const autofill::ServerFieldType& type) {
- return base::MakeUnique<std::string>(
+ return std::make_unique<std::string>(
base::UTF16ToUTF8(profile.GetRawInfo(type)));
}
diff --git a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
index 640cbc6..b54484f9 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_event_router.cc
@@ -110,7 +110,7 @@
browser_context = browser_context ? browser_context : active_profile_;
std::unique_ptr<base::ListValue> args(
api::automation_internal::OnAccessibilityTreeDestroyed::Create(tree_id));
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::AUTOMATION_INTERNAL_ON_ACCESSIBILITY_TREE_DESTROYED,
api::automation_internal::OnAccessibilityTreeDestroyed::kEventName,
std::move(args), browser_context);
@@ -127,7 +127,7 @@
std::unique_ptr<base::ListValue> args(
api::automation_internal::OnActionResult::Create(
data.target_tree_id, data.request_id, result));
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::AUTOMATION_INTERNAL_ON_ACTION_RESULT,
api::automation_internal::OnActionResult::kEventName, std::move(args),
active_profile_);
diff --git a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
index 7da08e8..d3fcb7a 100644
--- a/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
+++ b/chrome/browser/extensions/api/automation_internal/automation_internal_api.cc
@@ -10,7 +10,6 @@
#include <vector>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
@@ -548,7 +547,7 @@
return;
}
- Respond(OneArgument(base::MakeUnique<base::Value>(result_acc_obj_id)));
+ Respond(OneArgument(std::make_unique<base::Value>(result_acc_obj_id)));
}
} // namespace extensions
diff --git a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
index a3502dc..7a2179a 100644
--- a/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
+++ b/chrome/browser/extensions/api/autotest_private/autotest_private_api.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -51,7 +50,7 @@
effective_perm ? permissions_data->GetEffectiveHostPermissions()
: permissions_data->active_permissions().explicit_hosts();
- auto permissions = base::MakeUnique<base::ListValue>();
+ auto permissions = std::make_unique<base::ListValue>();
for (URLPatternSet::const_iterator perm = pattern_set.begin();
perm != pattern_set.end();
++perm) {
@@ -62,7 +61,7 @@
}
std::unique_ptr<base::ListValue> GetAPIPermissions(const Extension* ext) {
- auto permissions = base::MakeUnique<base::ListValue>();
+ auto permissions = std::make_unique<base::ListValue>();
std::set<std::string> perm_list =
ext->permissions_data()->active_permissions().GetAPIsAsStrings();
for (std::set<std::string>::const_iterator perm = perm_list.begin();
@@ -185,7 +184,7 @@
ExtensionActionManager* extension_action_manager =
ExtensionActionManager::Get(browser_context());
- auto extensions_values = base::MakeUnique<base::ListValue>();
+ auto extensions_values = std::make_unique<base::ListValue>();
ExtensionList all;
all.insert(all.end(), extensions.begin(), extensions.end());
all.insert(all.end(), disabled_extensions.begin(), disabled_extensions.end());
@@ -399,7 +398,7 @@
#if defined(OS_CHROMEOS)
for (auto* notification :
message_center::MessageCenter::Get()->GetVisibleNotifications()) {
- auto result = base::MakeUnique<base::DictionaryValue>();
+ auto result = std::make_unique<base::DictionaryValue>();
result->SetString("id", notification->id());
result->SetString("type", ConvertToString(notification->type()));
result->SetString("title", notification->title());
@@ -468,8 +467,8 @@
if (arc::IsArcAllowedForProfile(profile)) {
play_store_state.allowed = true;
play_store_state.enabled =
- base::MakeUnique<bool>(arc::IsArcPlayStoreEnabledForProfile(profile));
- play_store_state.managed = base::MakeUnique<bool>(
+ std::make_unique<bool>(arc::IsArcPlayStoreEnabledForProfile(profile));
+ play_store_state.managed = std::make_unique<bool>(
arc::IsArcPlayStoreEnabledPreferenceManagedForProfile(profile));
}
#endif
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
index 0d1ebac..bdc5848a 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc
@@ -12,7 +12,6 @@
#include <vector>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -193,7 +192,7 @@
const std::string& event_name,
std::unique_ptr<base::ListValue> event_args) {
EventRouter::Get(browser_context_)
- ->BroadcastEvent(base::MakeUnique<Event>(histogram_value, event_name,
+ ->BroadcastEvent(std::make_unique<Event>(histogram_value, event_name,
std::move(event_args)));
}
@@ -438,7 +437,7 @@
PrefService* prefs = user_prefs::UserPrefs::Get(GetProfile());
if (!prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled)) {
- SetResult(base::MakeUnique<base::Value>(false));
+ SetResult(std::make_unique<base::Value>(false));
return true;
}
@@ -450,7 +449,7 @@
return false;
}
bool can_paste = bookmarks::CanPasteFromClipboard(model, parent_node);
- SetResult(base::MakeUnique<base::Value>(can_paste));
+ SetResult(std::make_unique<base::Value>(can_paste));
return true;
}
@@ -654,7 +653,7 @@
bool BookmarkManagerPrivateCanEditFunction::RunOnReady() {
PrefService* prefs = user_prefs::UserPrefs::Get(GetProfile());
- SetResult(base::MakeUnique<base::Value>(
+ SetResult(std::make_unique<base::Value>(
prefs->GetBoolean(bookmarks::prefs::kEditBookmarksEnabled)));
return true;
}
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc
index b0f1c361..eab6d93f 100644
--- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc
+++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc
@@ -47,7 +47,7 @@
list.Append(std::move(node));
node.reset(new base::DictionaryValue());
node->SetString("name", "Managed Folder");
- node->Set("children", base::MakeUnique<base::ListValue>());
+ node->Set("children", std::make_unique<base::ListValue>());
list.Append(std::move(node));
profile->GetPrefs()->Set(bookmarks::prefs::kManagedBookmarks, list);
ASSERT_EQ(2, managed->managed_node()->child_count());
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
index c419376..0afc0ab3 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers.cc
@@ -6,10 +6,10 @@
#include <math.h> // For floor()
+#include <memory>
#include <utility>
#include <vector>
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -153,7 +153,7 @@
return;
const BookmarkNode::MetaInfoMap* meta_info = node.GetMetaInfoMap();
- auto value = base::MakeUnique<base::DictionaryValue>();
+ auto value = std::make_unique<base::DictionaryValue>();
if (meta_info) {
BookmarkNode::MetaInfoMap::const_iterator itr;
for (itr = meta_info->begin(); itr != meta_info->end(); ++itr) {
diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc
index 46b1c77..8717bf9 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc
@@ -5,7 +5,6 @@
#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -44,7 +43,7 @@
list.Append(std::move(node));
node.reset(new base::DictionaryValue());
node->SetString("name", "Managed Folder");
- node->Set("children", base::MakeUnique<base::ListValue>());
+ node->Set("children", std::make_unique<base::ListValue>());
list.Append(std::move(node));
profile->GetPrefs()->Set(bookmarks::prefs::kManagedBookmarks, list);
ASSERT_EQ(2, managed->managed_node()->child_count());
diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
index 7ba7a25d..397e6f9 100644
--- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
+++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc
@@ -14,7 +14,6 @@
#include "base/i18n/file_util_icu.h"
#include "base/i18n/time_formatting.h"
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/sha1.h"
#include "base/stl_util.h"
@@ -263,7 +262,7 @@
std::unique_ptr<base::ListValue> event_args) {
EventRouter* event_router = EventRouter::Get(browser_context_);
if (event_router) {
- event_router->BroadcastEvent(base::MakeUnique<extensions::Event>(
+ event_router->BroadcastEvent(std::make_unique<extensions::Event>(
histogram_value, event_name, std::move(event_args)));
}
}
diff --git a/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc b/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc
index 83528fa0..ce47805 100644
--- a/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc
+++ b/chrome/browser/extensions/api/certificate_provider/certificate_provider_api.cc
@@ -11,7 +11,6 @@
#include <vector>
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service.h"
#include "chrome/browser/chromeos/certificate_provider/certificate_provider_service_factory.h"
#include "chrome/common/extensions/api/certificate_provider.h"
@@ -257,7 +256,7 @@
QuotaLimitHeuristic::Config short_limit_config = {
api::certificate_provider::kMaxClosedDialogsPer10Mins,
base::TimeDelta::FromMinutes(10)};
- heuristics->push_back(base::MakeUnique<QuotaService::TimedLimit>(
+ heuristics->push_back(std::make_unique<QuotaService::TimedLimit>(
short_limit_config, new QuotaLimitHeuristic::SingletonBucketMapper(),
"MAX_PIN_DIALOGS_CLOSED_PER_10_MINUTES"));
}
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
index c732c6e..e256545 100644
--- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/extensions/api/chrome_extensions_api_client.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "build/build_config.h"
#include "chrome/browser/data_use_measurement/data_use_web_contents_observer.h"
@@ -123,13 +123,13 @@
std::unique_ptr<guest_view::GuestViewManagerDelegate>
ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
content::BrowserContext* context) const {
- return base::MakeUnique<ChromeGuestViewManagerDelegate>(context);
+ return std::make_unique<ChromeGuestViewManagerDelegate>(context);
}
std::unique_ptr<MimeHandlerViewGuestDelegate>
ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate(
MimeHandlerViewGuest* guest) const {
- return base::MakeUnique<ChromeMimeHandlerViewGuestDelegate>();
+ return std::make_unique<ChromeMimeHandlerViewGuestDelegate>();
}
WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate(
@@ -145,7 +145,7 @@
std::unique_ptr<WebRequestEventRouterDelegate>
ChromeExtensionsAPIClient::CreateWebRequestEventRouterDelegate() const {
- return base::MakeUnique<ChromeExtensionWebRequestEventRouterDelegate>();
+ return std::make_unique<ChromeExtensionWebRequestEventRouterDelegate>();
}
scoped_refptr<ContentRulesRegistry>
@@ -163,14 +163,14 @@
std::unique_ptr<DevicePermissionsPrompt>
ChromeExtensionsAPIClient::CreateDevicePermissionsPrompt(
content::WebContents* web_contents) const {
- return base::MakeUnique<ChromeDevicePermissionsPrompt>(web_contents);
+ return std::make_unique<ChromeDevicePermissionsPrompt>(web_contents);
}
std::unique_ptr<VirtualKeyboardDelegate>
ChromeExtensionsAPIClient::CreateVirtualKeyboardDelegate(
content::BrowserContext* browser_context) const {
#if defined(OS_CHROMEOS)
- return base::MakeUnique<ChromeVirtualKeyboardDelegate>(browser_context);
+ return std::make_unique<ChromeVirtualKeyboardDelegate>(browser_context);
#else
return nullptr;
#endif
@@ -199,13 +199,13 @@
FileSystemDelegate* ChromeExtensionsAPIClient::GetFileSystemDelegate() {
if (!file_system_delegate_)
- file_system_delegate_ = base::MakeUnique<ChromeFileSystemDelegate>();
+ file_system_delegate_ = std::make_unique<ChromeFileSystemDelegate>();
return file_system_delegate_.get();
}
MessagingDelegate* ChromeExtensionsAPIClient::GetMessagingDelegate() {
if (!messaging_delegate_)
- messaging_delegate_ = base::MakeUnique<ChromeMessagingDelegate>();
+ messaging_delegate_ = std::make_unique<ChromeMessagingDelegate>();
return messaging_delegate_.get();
}
@@ -213,7 +213,7 @@
ChromeExtensionsAPIClient::GetFeedbackPrivateDelegate() {
if (!feedback_private_delegate_) {
feedback_private_delegate_ =
- base::MakeUnique<ChromeFeedbackPrivateDelegate>();
+ std::make_unique<ChromeFeedbackPrivateDelegate>();
}
return feedback_private_delegate_.get();
}
@@ -232,7 +232,7 @@
ChromeExtensionsAPIClient::GetNonNativeFileSystemDelegate() {
if (!non_native_file_system_delegate_) {
non_native_file_system_delegate_ =
- base::MakeUnique<NonNativeFileSystemDelegateChromeOS>();
+ std::make_unique<NonNativeFileSystemDelegateChromeOS>();
}
return non_native_file_system_delegate_.get();
}
@@ -244,7 +244,7 @@
const base::Closure& success_callback,
const base::Callback<void(const std::string&)>& error_callback) {
if (!clipboard_extension_helper_)
- clipboard_extension_helper_ = base::MakeUnique<ClipboardExtensionHelper>();
+ clipboard_extension_helper_ = std::make_unique<ClipboardExtensionHelper>();
clipboard_extension_helper_->DecodeAndSaveImageData(
image_data, type, std::move(additional_items), success_callback,
error_callback);
diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
index a00c43c..90c1889 100644
--- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
+++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h"
+#include <memory>
#include <string>
-#include "base/memory/ptr_util.h"
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
@@ -77,7 +77,7 @@
}
bool CloudPrintPrivateGetHostNameFunction::RunAsync() {
- SetResult(base::MakeUnique<base::Value>(
+ SetResult(std::make_unique<base::Value>(
CloudPrintTestsDelegate::Get()
? CloudPrintTestsDelegate::Get()->GetHostName()
: net::GetHostName()));
@@ -122,7 +122,7 @@
}
bool CloudPrintPrivateGetClientIdFunction::RunAsync() {
- SetResult(base::MakeUnique<base::Value>(
+ SetResult(std::make_unique<base::Value>(
CloudPrintTestsDelegate::Get()
? CloudPrintTestsDelegate::Get()->GetClientId()
: google_apis::GetOAuth2ClientID(google_apis::CLIENT_CLOUD_PRINT)));
diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc
index f59d389..3f3661f 100644
--- a/chrome/browser/extensions/api/commands/command_service.cc
+++ b/chrome/browser/extensions/api/commands/command_service.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/extensions/api/commands/command_service.h"
+#include <memory>
#include <utility>
#include <vector>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -87,7 +87,7 @@
void SetInitialBindingsHaveBeenAssigned(
ExtensionPrefs* prefs, const std::string& extension_id) {
prefs->UpdateExtensionPref(extension_id, kInitialBindingsHaveBeenAssigned,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
}
bool InitialBindingsHaveBeenAssigned(
@@ -277,7 +277,7 @@
RemoveKeybindingPrefs(extension_id, command_name);
// Set the keybinding pref.
- auto keybinding = base::MakeUnique<base::DictionaryValue>();
+ auto keybinding = std::make_unique<base::DictionaryValue>();
keybinding->SetString(kExtension, extension_id);
keybinding->SetString(kCommandName, command_name);
keybinding->SetBoolean(kGlobal, global);
diff --git a/chrome/browser/extensions/api/commands/command_service_browsertest.cc b/chrome/browser/extensions/api/commands/command_service_browsertest.cc
index efdef90..c9ecdae1 100644
--- a/chrome/browser/extensions/api/commands/command_service_browsertest.cc
+++ b/chrome/browser/extensions/api/commands/command_service_browsertest.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -116,7 +116,7 @@
// another platform.
std::string anotherPlatformKey = GetAnotherCommandPlatform() + ":Alt+G";
const char kNamedCommandName[] = "toggle-feature";
- auto keybinding = base::MakeUnique<base::DictionaryValue>();
+ auto keybinding = std::make_unique<base::DictionaryValue>();
keybinding->SetString("extension", extension->id());
keybinding->SetString("command_name", kNamedCommandName);
keybinding->SetBoolean("global", false);
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store.cc b/chrome/browser/extensions/api/content_settings/content_settings_store.cc
index dd3ce91..d3574455 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_store.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store.cc
@@ -91,7 +91,7 @@
if (iterators.empty())
return nullptr;
- return base::MakeUnique<ConcatenationIterator>(std::move(iterators),
+ return std::make_unique<ConcatenationIterator>(std::move(iterators),
auto_lock.release());
}
@@ -254,7 +254,7 @@
if (!map)
return nullptr;
- auto settings = base::MakeUnique<base::ListValue>();
+ auto settings = std::make_unique<base::ListValue>();
for (const auto& it : *map) {
const auto& key = it.first;
std::unique_ptr<RuleIterator> rule_iterator(
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
index f516ce4..7a951d7 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
+++ b/chrome/browser/extensions/api/content_settings/content_settings_store_unittest.cc
@@ -8,7 +8,6 @@
#include <memory>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/content_settings/content_settings_api_constants.h"
#include "components/content_settings/core/browser/content_settings_registry.h"
@@ -293,7 +292,7 @@
base::ListValue pref_list;
// {"primaryPattern": pattern, "secondaryPattern": pattern, "type": "cookies",
// "setting": "allow"}
- auto dict_value = base::MakeUnique<base::DictionaryValue>();
+ auto dict_value = std::make_unique<base::DictionaryValue>();
dict_value->SetString(keys::kPrimaryPatternKey, pattern.ToString());
dict_value->SetString(keys::kSecondaryPatternKey, pattern.ToString());
dict_value->SetString(keys::kContentSettingsTypeKey, "cookies");
@@ -302,7 +301,7 @@
// Test content settings types that have been removed. Should be ignored.
// {"primaryPattern": pattern, "secondaryPattern": pattern,
// "type": "fullscreen", "setting": "allow"}
- dict_value = base::MakeUnique<base::DictionaryValue>();
+ dict_value = std::make_unique<base::DictionaryValue>();
dict_value->SetString(keys::kPrimaryPatternKey, pattern.ToString());
dict_value->SetString(keys::kSecondaryPatternKey, pattern.ToString());
dict_value->SetString(keys::kContentSettingsTypeKey, "fullscreen");
@@ -310,7 +309,7 @@
pref_list.Append(std::move(dict_value));
// {"primaryPattern": pattern, "secondaryPattern": pattern,
// "type": "mouselock", "setting": "allow"}
- dict_value = base::MakeUnique<base::DictionaryValue>();
+ dict_value = std::make_unique<base::DictionaryValue>();
dict_value->SetString(keys::kPrimaryPatternKey, pattern.ToString());
dict_value->SetString(keys::kSecondaryPatternKey, pattern.ToString());
dict_value->SetString(keys::kContentSettingsTypeKey, "mouselock");
diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
index 8feb848..6a5ef9f 100644
--- a/chrome/browser/extensions/api/cookies/cookies_api.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
@@ -13,7 +13,6 @@
#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"
@@ -186,7 +185,7 @@
EventRouter* router = context ? EventRouter::Get(context) : NULL;
if (!router)
return;
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(event_args), context);
event->event_url = cookie_domain;
router->BroadcastEvent(std::move(event));
@@ -241,7 +240,7 @@
// The cookie doesn't exist; return null.
if (!results_)
- SetResult(base::MakeUnique<base::Value>());
+ SetResult(std::make_unique<base::Value>());
SendResponse(true);
}
diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
index 6aeccbf..ce043bf 100644
--- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc
+++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc
@@ -7,10 +7,10 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/cookies/cookies_api_constants.h"
#include "chrome/browser/extensions/api/cookies/cookies_helpers.h"
@@ -86,7 +86,7 @@
TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) {
std::unique_ptr<net::CanonicalCookie> canonical_cookie1(
- base::MakeUnique<net::CanonicalCookie>(
+ std::make_unique<net::CanonicalCookie>(
"ABC", "DEF", "www.example.com", "/", base::Time(), base::Time(),
base::Time(), false, false, net::CookieSameSite::DEFAULT_MODE,
net::COOKIE_PRIORITY_DEFAULT));
@@ -106,7 +106,7 @@
EXPECT_EQ("some cookie store", cookie1.store_id);
std::unique_ptr<net::CanonicalCookie> canonical_cookie2(
- base::MakeUnique<net::CanonicalCookie>(
+ std::make_unique<net::CanonicalCookie>(
"ABC", "DEF", ".example.com", "/", base::Time(),
base::Time::FromDoubleT(10000), base::Time(), false, false,
net::CookieSameSite::STRICT_MODE, net::COOKIE_PRIORITY_DEFAULT));
@@ -120,7 +120,7 @@
EXPECT_EQ(10000, *cookie2.expiration_date);
TestingProfile profile;
- auto tab_ids_list = base::MakeUnique<base::ListValue>();
+ auto tab_ids_list = std::make_unique<base::ListValue>();
std::vector<int> tab_ids;
CookieStore cookie_store =
cookies_helpers::CreateCookieStore(&profile, std::move(tab_ids_list));
@@ -130,7 +130,7 @@
TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) {
std::unique_ptr<net::CanonicalCookie> cookie1(
- base::MakeUnique<net::CanonicalCookie>(
+ std::make_unique<net::CanonicalCookie>(
"ABC", "DEF", ".example.com", "/", base::Time(), base::Time(),
base::Time(), false, false, net::CookieSameSite::DEFAULT_MODE,
net::COOKIE_PRIORITY_DEFAULT));
@@ -139,7 +139,7 @@
cookies_helpers::GetURLFromCanonicalCookie(*cookie1).spec());
std::unique_ptr<net::CanonicalCookie> cookie2(
- base::MakeUnique<net::CanonicalCookie>(
+ std::make_unique<net::CanonicalCookie>(
"ABC", "DEF", ".helloworld.com", "/", base::Time(), base::Time(),
base::Time(), true, false, net::CookieSameSite::DEFAULT_MODE,
net::COOKIE_PRIORITY_DEFAULT));
@@ -168,14 +168,14 @@
for (size_t i = 0; i < arraysize(tests); ++i) {
// Build up the Params struct.
base::ListValue args;
- auto dict = base::MakeUnique<base::DictionaryValue>();
+ auto dict = std::make_unique<base::DictionaryValue>();
dict->SetString(keys::kDomainKey, std::string(tests[i].filter));
args.Set(0, std::move(dict));
std::unique_ptr<GetAll::Params> params(GetAll::Params::Create(args));
cookies_helpers::MatchFilter filter(¶ms->details);
std::unique_ptr<net::CanonicalCookie> cookie(
- base::MakeUnique<net::CanonicalCookie>(
+ std::make_unique<net::CanonicalCookie>(
"name", std::string(), tests[i].domain, "/", base::Time(),
base::Time(), base::Time(), false, false,
net::CookieSameSite::DEFAULT_MODE, net::COOKIE_PRIORITY_DEFAULT));
diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc
index 8d08b868..f005243 100644
--- a/chrome/browser/extensions/api/debugger/debugger_api.cc
+++ b/chrome/browser/extensions/api/debugger/debugger_api.cc
@@ -252,7 +252,7 @@
std::unique_ptr<base::ListValue> args(
OnDetach::Create(debuggee_, detach_reason_));
auto event =
- base::MakeUnique<Event>(events::DEBUGGER_ON_DETACH, OnDetach::kEventName,
+ std::make_unique<Event>(events::DEBUGGER_ON_DETACH, OnDetach::kEventName,
std::move(args), profile_);
EventRouter::Get(profile_)
->DispatchEventToExtension(extension_id_, std::move(event));
@@ -300,7 +300,7 @@
std::unique_ptr<base::ListValue> args(
OnEvent::Create(debuggee_, method_name, params));
auto event =
- base::MakeUnique<Event>(events::DEBUGGER_ON_EVENT, OnEvent::kEventName,
+ std::make_unique<Event>(events::DEBUGGER_ON_EVENT, OnEvent::kEventName,
std::move(args), profile_);
EventRouter::Get(profile_)
->DispatchEventToExtension(extension_id_, std::move(event));
diff --git a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
index 8a24e60..d9059db 100644
--- a/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
+++ b/chrome/browser/extensions/api/declarative/rules_registry_with_cache_unittest.cc
@@ -8,8 +8,9 @@
// implementation of RulesRegistryWithCache as a proxy for
// RulesRegistryWithCache.
+#include <memory>
+
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/test_extension_environment.h"
#include "chrome/browser/extensions/test_extension_system.h"
@@ -243,11 +244,11 @@
EXPECT_TRUE(cache_delegate->GetDeclarativeRulesStored(extension1_->id()));
extension_prefs->UpdateExtensionPref(extension1_->id(), rules_stored_key,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
EXPECT_FALSE(cache_delegate->GetDeclarativeRulesStored(extension1_->id()));
extension_prefs->UpdateExtensionPref(extension1_->id(), rules_stored_key,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
EXPECT_TRUE(cache_delegate->GetDeclarativeRulesStored(extension1_->id()));
// 2. Test writing behavior.
@@ -320,7 +321,7 @@
// Update the flag for the first registry.
extension_prefs->UpdateExtensionPref(extension1_->id(), rules_stored_key1,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
EXPECT_FALSE(cache_delegate1->GetDeclarativeRulesStored(extension1_->id()));
EXPECT_TRUE(cache_delegate2->GetDeclarativeRulesStored(extension1_->id()));
}
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
index be2b662..7e3a26d 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/profiles/profile.h"
@@ -180,7 +179,7 @@
// Note: |api_rule| may contain tags, but these are ignored.
- return base::MakeUnique<ContentRule>(extension, std::move(conditions),
+ return std::make_unique<ContentRule>(extension, std::move(conditions),
std::move(actions), *api_rule.priority);
}
diff --git a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
index e33493a..cedb5c7 100644
--- a/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_content/chrome_content_rules_registry_unittest.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/test/values_test_util.h"
#include "chrome/browser/extensions/api/declarative_content/content_predicate.h"
#include "chrome/browser/extensions/api/declarative_content/content_predicate_evaluator.h"
@@ -58,7 +57,7 @@
const base::Value& value,
std::string* error) override {
RequestEvaluationIfSpecified();
- return base::MakeUnique<TestPredicate>(this);
+ return std::make_unique<TestPredicate>(this);
}
void TrackPredicates(
diff --git a/chrome/browser/extensions/api/declarative_content/content_action.cc b/chrome/browser/extensions/api/declarative_content/content_action.cc
index f4df5b427..fa344ec 100644
--- a/chrome/browser/extensions/api/declarative_content/content_action.cc
+++ b/chrome/browser/extensions/api/declarative_content/content_action.cc
@@ -347,7 +347,7 @@
it != script_data.css_file_names.end(); ++it) {
GURL url = extension->GetResourceURL(*it);
ExtensionResource resource = extension->GetResource(*it);
- script_.css_scripts().push_back(base::MakeUnique<UserScript::File>(
+ script_.css_scripts().push_back(std::make_unique<UserScript::File>(
resource.extension_root(), resource.relative_path(), url));
}
for (std::vector<std::string>::const_iterator it =
@@ -355,7 +355,7 @@
it != script_data.js_file_names.end(); ++it) {
GURL url = extension->GetResourceURL(*it);
ExtensionResource resource = extension->GetResource(*it);
- script_.js_scripts().push_back(base::MakeUnique<UserScript::File>(
+ script_.js_scripts().push_back(std::make_unique<UserScript::File>(
resource.extension_root(), resource.relative_path(), url));
}
}
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
index c73ed28f..9fd06229 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc
@@ -14,7 +14,6 @@
#include "base/json/json_reader.h"
#include "base/macros.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/stl_util.h"
#include "base/test/values_test_util.h"
@@ -103,18 +102,18 @@
// Returns a rule that roughly matches http://*.example.com and
// https://www.example.com and cancels it
linked_ptr<api::events::Rule> CreateRule1() {
- auto scheme_http = base::MakeUnique<base::ListValue>();
+ auto scheme_http = std::make_unique<base::ListValue>();
scheme_http->AppendString("http");
- auto http_condition_dict = base::MakeUnique<base::DictionaryValue>();
+ auto http_condition_dict = std::make_unique<base::DictionaryValue>();
http_condition_dict->SetString(keys2::kHostSuffixKey, "example.com");
base::DictionaryValue http_condition_url_filter;
http_condition_url_filter.SetString(keys::kInstanceTypeKey,
keys::kRequestMatcherType);
scheme_http->AppendString("https");
- auto https_condition_dict = base::MakeUnique<base::DictionaryValue>();
+ auto https_condition_dict = std::make_unique<base::DictionaryValue>();
https_condition_dict->Set(keys2::kSchemesKey,
- base::MakeUnique<base::ListValue>());
+ std::make_unique<base::ListValue>());
https_condition_dict->SetString(keys2::kHostSuffixKey, "example.com");
https_condition_dict->SetString(keys2::kHostPrefixKey, "www");
base::DictionaryValue https_condition_url_filter;
@@ -175,7 +174,7 @@
// contains index.html.
linked_ptr<api::events::Rule> CreateIgnoreRule() {
base::DictionaryValue condition_dict;
- auto http_condition_dict = base::MakeUnique<base::DictionaryValue>();
+ auto http_condition_dict = std::make_unique<base::DictionaryValue>();
http_condition_dict->SetString(keys2::kPathContainsKey, "index.html");
condition_dict.SetString(keys::kInstanceTypeKey, keys::kRequestMatcherType);
condition_dict.Set(keys::kUrlKey, std::move(http_condition_dict));
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
index 6086213..392ecad 100644
--- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
+++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_base.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/extensions/api/desktop_capture/desktop_capture_base.h"
+#include <memory>
#include <tuple>
#include <utility>
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_tab_util.h"
@@ -118,10 +118,10 @@
g_picker_factory->CreateMediaList(DesktopMediaID::TYPE_SCREEN);
} else {
#if defined(OS_CHROMEOS)
- screen_list = base::MakeUnique<DesktopMediaListAsh>(
+ screen_list = std::make_unique<DesktopMediaListAsh>(
DesktopMediaID::TYPE_SCREEN);
#else // !defined(OS_CHROMEOS)
- screen_list = base::MakeUnique<NativeDesktopMediaList>(
+ screen_list = std::make_unique<NativeDesktopMediaList>(
content::DesktopMediaID::TYPE_SCREEN,
webrtc::DesktopCapturer::CreateScreenCapturer(
content::CreateDesktopCaptureOptions()));
@@ -141,7 +141,7 @@
g_picker_factory->CreateMediaList(DesktopMediaID::TYPE_WINDOW);
} else {
#if defined(OS_CHROMEOS)
- window_list = base::MakeUnique<DesktopMediaListAsh>(
+ window_list = std::make_unique<DesktopMediaListAsh>(
DesktopMediaID::TYPE_WINDOW);
#else // !defined(OS_CHROMEOS)
// NativeDesktopMediaList calls the capturers on a background thread.
@@ -149,7 +149,7 @@
// windows) created here cannot share the same DesktopCaptureOptions
// instance. DesktopCaptureOptions owns X connection, which cannot be
// used on multiple threads concurrently.
- window_list = base::MakeUnique<NativeDesktopMediaList>(
+ window_list = std::make_unique<NativeDesktopMediaList>(
content::DesktopMediaID::TYPE_WINDOW,
webrtc::DesktopCapturer::CreateWindowCapturer(
content::CreateDesktopCaptureOptions()));
@@ -170,7 +170,7 @@
tab_list = g_picker_factory->CreateMediaList(
DesktopMediaID::TYPE_WEB_CONTENTS);
} else {
- tab_list = base::MakeUnique<TabDesktopMediaList>();
+ tab_list = std::make_unique<TabDesktopMediaList>();
}
have_tab_list = true;
source_lists.push_back(std::move(tab_list));
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
index 48f3bb4..5f5cc11 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc
@@ -5,13 +5,13 @@
#include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/files/file_util.h"
#include "base/guid.h"
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -1199,7 +1199,7 @@
AddRef(); // Balanced in OnPackSuccess / OnPackFailure.
pack_job_ =
- base::MakeUnique<PackExtensionJob>(this, root_directory, key_file, flags);
+ std::make_unique<PackExtensionJob>(this, root_directory, key_file, flags);
pack_job_->Start();
return RespondLater();
}
@@ -1312,7 +1312,7 @@
// TODO(grv) : The unpacked installer should fire an event when complete
// and return the extension_id.
- SetResult(base::MakeUnique<base::Value>("-1"));
+ SetResult(std::make_unique<base::Value>("-1"));
SendResponse(true);
}
@@ -1485,7 +1485,7 @@
void DeveloperPrivateChoosePathFunction::FileSelected(
const base::FilePath& path) {
- Respond(OneArgument(base::MakeUnique<base::Value>(path.LossyDisplayName())));
+ Respond(OneArgument(std::make_unique<base::Value>(path.LossyDisplayName())));
Release();
}
@@ -1500,7 +1500,7 @@
ExtensionFunction::ResponseAction
DeveloperPrivateIsProfileManagedFunction::Run() {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(
+ return RespondNow(OneArgument(std::make_unique<base::Value>(
Profile::FromBrowserContext(browser_context())->IsSupervised())));
}
diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
index 00d1077..dfa65192 100644
--- a/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
+++ b/chrome/browser/extensions/api/developer_private/developer_private_api_unittest.cc
@@ -9,7 +9,6 @@
#include "base/files/file_util.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/scoped_observer.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -67,12 +66,12 @@
const char kGoodCrx[] = "ldnnhddmnhbkjipkidpdiheffobcpfmf";
std::unique_ptr<KeyedService> BuildAPI(content::BrowserContext* context) {
- return base::MakeUnique<DeveloperPrivateAPI>(context);
+ return std::make_unique<DeveloperPrivateAPI>(context);
}
std::unique_ptr<KeyedService> BuildEventRouter(
content::BrowserContext* profile) {
- return base::MakeUnique<EventRouter>(profile, ExtensionPrefs::Get(profile));
+ return std::make_unique<EventRouter>(profile, ExtensionPrefs::Get(profile));
}
bool HasAllUrlsPermission(const Extension* extension,
@@ -170,7 +169,7 @@
" \"permissions\": [\"*://*/*\"]"
"}";
- test_extension_dirs_.push_back(base::MakeUnique<TestExtensionDir>());
+ test_extension_dirs_.push_back(std::make_unique<TestExtensionDir>());
TestExtensionDir* dir = test_extension_dirs_.back().get();
dir->WriteManifest(kManifest);
@@ -223,7 +222,7 @@
EXPECT_FALSE(has_pref.Run()) << key;
{
- auto parameters = base::MakeUnique<base::DictionaryValue>();
+ auto parameters = std::make_unique<base::DictionaryValue>();
parameters->SetString("extensionId", extension_id);
parameters->SetBoolean(key, true);
@@ -244,7 +243,7 @@
}
{
- auto parameters = base::MakeUnique<base::DictionaryValue>();
+ auto parameters = std::make_unique<base::DictionaryValue>();
parameters->SetString("extensionId", extension_id);
parameters->SetBoolean(key, false);
@@ -1107,7 +1106,7 @@
// Set up a mock provider with a policy extension.
std::unique_ptr<MockExternalProvider> mock_provider =
- base::MakeUnique<MockExternalProvider>(
+ std::make_unique<MockExternalProvider>(
service(), Manifest::EXTERNAL_POLICY_DOWNLOAD);
MockExternalProvider* mock_provider_ptr = mock_provider.get();
AddMockExternalProvider(std::move(mock_provider));
@@ -1143,7 +1142,7 @@
// when DeveloperToolsDisabled policy is active.
TEST_F(DeveloperPrivateApiUnitTest, DeveloperPrivateDevModeDisabledPolicy) {
testing_pref_service()->SetManagedPref(prefs::kExtensionsUIDeveloperMode,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
UpdateProfileConfigurationDevMode(true);
diff --git a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
index 85440fe..e776047 100644
--- a/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
+++ b/chrome/browser/extensions/api/device_permissions_manager_unittest.cc
@@ -4,6 +4,8 @@
#include <stdint.h>
+#include <memory>
+
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/values_test_util.h"
@@ -42,7 +44,7 @@
std::unique_ptr<KeyedService> CreateHidDeviceManager(
content::BrowserContext* context) {
- return base::MakeUnique<FakeHidDeviceManager>(context);
+ return std::make_unique<FakeHidDeviceManager>(context);
}
} // namespace
diff --git a/chrome/browser/extensions/api/dial/dial_api.cc b/chrome/browser/extensions/api/dial/dial_api.cc
index 1dd4d588..a5922dc 100644
--- a/chrome/browser/extensions/api/dial/dial_api.cc
+++ b/chrome/browser/extensions/api/dial/dial_api.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/bind.h"
-#include "base/memory/ptr_util.h"
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/dial/dial_api_factory.h"
@@ -184,9 +183,9 @@
void DialAPI::SetDeviceForTest(
const media_router::DialDeviceData& device_data,
const media_router::DialDeviceDescriptionData& device_description) {
- test_device_data_ = base::MakeUnique<DialDeviceData>(device_data);
+ test_device_data_ = std::make_unique<DialDeviceData>(device_data);
test_device_description_ =
- base::MakeUnique<DialDeviceDescriptionData>(device_description);
+ std::make_unique<DialDeviceDescriptionData>(device_description);
}
DialDiscoverNowFunction::DialDiscoverNowFunction()
@@ -207,7 +206,7 @@
bool DialDiscoverNowFunction::Respond() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
- SetResult(base::MakeUnique<base::Value>(result_));
+ SetResult(std::make_unique<base::Value>(result_));
return true;
}
@@ -255,7 +254,7 @@
return;
}
- device_description_fetcher_ = base::MakeUnique<DeviceDescriptionFetcher>(
+ device_description_fetcher_ = std::make_unique<DeviceDescriptionFetcher>(
url, Profile::FromBrowserContext(browser_context())->GetRequestContext(),
base::BindOnce(&DialFetchDeviceDescriptionFunction::OnFetchComplete,
this),
diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc
index fc4d756..e4fd3fb3 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -1107,7 +1107,7 @@
VLOG(1) << __func__ << " " << item << " " << interrupt_reason;
if (item) {
DCHECK_EQ(content::DOWNLOAD_INTERRUPT_REASON_NONE, interrupt_reason);
- SetResult(base::MakeUnique<base::Value>(static_cast<int>(item->GetId())));
+ SetResult(std::make_unique<base::Value>(static_cast<int>(item->GetId())));
if (!creator_suggested_filename.empty() ||
(creator_conflict_action !=
downloads::FILENAME_CONFLICT_ACTION_UNIQUIFY)) {
@@ -1581,7 +1581,7 @@
return;
}
RecordApiFunctions(DOWNLOADS_FUNCTION_GET_FILE_ICON);
- SetResult(base::MakeUnique<base::Value>(url));
+ SetResult(std::make_unique<base::Value>(url));
SendResponse(true);
}
@@ -1921,7 +1921,7 @@
DispatchEvent(
events::DOWNLOADS_ON_ERASED, downloads::OnErased::kEventName, true,
Event::WillDispatchCallback(),
- base::MakeUnique<base::Value>(static_cast<int>(download_item->GetId())));
+ std::make_unique<base::Value>(static_cast<int>(download_item->GetId())));
}
void ExtensionDownloadsEventRouter::DispatchEvent(
@@ -1949,7 +1949,7 @@
Profile* restrict_to_browser_context =
(include_incognito && !profile_->IsOffTheRecord()) ? nullptr : profile_;
auto event =
- base::MakeUnique<Event>(histogram_value, event_name, std::move(args),
+ std::make_unique<Event>(histogram_value, event_name, std::move(args),
restrict_to_browser_context);
event->will_dispatch_callback = will_dispatch_callback;
EventRouter::Get(profile_)->BroadcastEvent(std::move(event));
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
index 1351c63..af2fc33 100644
--- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/api/downloads/downloads_api.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/download/download_core_service_factory.h"
#include "chrome/browser/download/download_core_service_impl.h"
#include "chrome/browser/download/download_history.h"
@@ -117,7 +116,7 @@
std::unique_ptr<KeyedService>
DownloadsApiUnitTest::TestingDownloadCoreServiceFactory(
content::BrowserContext* browser_context) {
- return base::MakeUnique<TestDownloadCoreService>(
+ return std::make_unique<TestDownloadCoreService>(
Profile::FromBrowserContext(browser_context));
}
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
index dd89370..7f41f2d 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/task_scheduler/post_task.h"
@@ -703,7 +702,7 @@
const base::ListValue* devices =
EasyUnlockService::Get(profile)->GetRemoteDevices();
SetResult(devices ? devices->CreateDeepCopy()
- : base::MakeUnique<base::ListValue>());
+ : std::make_unique<base::ListValue>());
SendResponse(true);
}
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
index 499280b..290b81d 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_api_unittest.h"
@@ -261,7 +260,7 @@
std::unique_ptr<base::ListValue> args(new base::ListValue);
args->Append(StringToBinaryValue("PAYLOAD"));
args->Append(StringToBinaryValue("KEY"));
- auto options = base::MakeUnique<base::DictionaryValue>();
+ auto options = std::make_unique<base::DictionaryValue>();
options->Set("associatedData", StringToBinaryValue("ASSOCIATED_DATA"));
options->Set("publicMetadata", StringToBinaryValue("PUBLIC_METADATA"));
options->Set("verificationKeyId",
@@ -303,7 +302,7 @@
std::unique_ptr<base::ListValue> args(new base::ListValue);
args->Append(StringToBinaryValue("PAYLOAD"));
args->Append(StringToBinaryValue("KEY"));
- auto options = base::MakeUnique<base::DictionaryValue>();
+ auto options = std::make_unique<base::DictionaryValue>();
args->Append(std::move(options));
ASSERT_TRUE(extension_function_test_utils::RunFunction(
@@ -335,7 +334,7 @@
std::unique_ptr<base::ListValue> args(new base::ListValue);
args->Append(StringToBinaryValue("PAYLOAD"));
args->Append(StringToBinaryValue("KEY"));
- auto options = base::MakeUnique<base::DictionaryValue>();
+ auto options = std::make_unique<base::DictionaryValue>();
options->Set("associatedData",
StringToBinaryValue("ASSOCIATED_DATA"));
options->Set("verificationKeyId",
@@ -373,7 +372,7 @@
std::unique_ptr<base::ListValue> args(new base::ListValue);
args->Append(StringToBinaryValue("MESSAGE"));
args->Append(StringToBinaryValue("KEY"));
- auto options = base::MakeUnique<base::DictionaryValue>();
+ auto options = std::make_unique<base::DictionaryValue>();
options->Set("associatedData", StringToBinaryValue("ASSOCIATED_DATA"));
options->SetString(
"encryptType",
@@ -410,7 +409,7 @@
std::unique_ptr<base::ListValue> args(new base::ListValue);
args->Append(StringToBinaryValue("MESSAGE"));
args->Append(StringToBinaryValue("KEY"));
- auto options = base::MakeUnique<base::DictionaryValue>();
+ auto options = std::make_unique<base::DictionaryValue>();
args->Append(std::move(options));
ASSERT_TRUE(extension_function_test_utils::RunFunction(
@@ -441,7 +440,7 @@
std::unique_ptr<base::ListValue> args(new base::ListValue);
args->Append(StringToBinaryValue("MESSAGE"));
args->Append(StringToBinaryValue("KEY"));
- auto options = base::MakeUnique<base::DictionaryValue>();
+ auto options = std::make_unique<base::DictionaryValue>();
options->Set("associatedData",
StringToBinaryValue("ASSOCIATED_DATA"));
options->SetString(
diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.cc
index 421f4f19..0ca60a93 100644
--- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.cc
+++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection_manager.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_connection.h"
#include "chrome/common/extensions/api/easy_unlock_private.h"
#include "components/cryptauth/connection.h"
@@ -102,7 +101,7 @@
const std::string& message_body) {
Connection* connection = GetConnection(extension->id(), connection_id);
if (connection && connection->IsConnected()) {
- connection->SendMessage(base::MakeUnique<WireMessage>(message_body));
+ connection->SendMessage(std::make_unique<WireMessage>(message_body));
return true;
}
return false;
@@ -172,7 +171,7 @@
std::unique_ptr<base::ListValue> args_copy(args->DeepCopy());
int connection_index = 0;
args_copy->Set(connection_index,
- base::MakeUnique<base::Value>(connection_id));
+ std::make_unique<base::Value>(connection_id));
std::unique_ptr<Event> event(
new Event(histogram_value, event_name, std::move(args_copy)));
EventRouter::Get(browser_context_)
diff --git a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc
index a83c8672..b4422a1 100644
--- a/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc
+++ b/chrome/browser/extensions/api/enterprise_device_attributes/enterprise_device_attributes_apitest.cc
@@ -2,7 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/ptr_util.h"
+#include <memory>
+
#include "base/strings/stringprintf.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/policy/affiliation_test_helper.h"
@@ -98,7 +99,7 @@
// Set up fake install attributes.
std::unique_ptr<chromeos::StubInstallAttributes> attributes =
- base::MakeUnique<chromeos::StubInstallAttributes>();
+ std::make_unique<chromeos::StubInstallAttributes>();
attributes->SetCloudManaged("fake-domain", "fake-id");
policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
diff --git a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc
index 7b64d05..6ca6aa5 100644
--- a/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc
+++ b/chrome/browser/extensions/api/enterprise_platform_keys/enterprise_platform_keys_api_unittest.cc
@@ -240,11 +240,11 @@
}
std::unique_ptr<base::ListValue> CreateArgsNoRegister() {
- return CreateArgsInternal(base::MakeUnique<bool>(false));
+ return CreateArgsInternal(std::make_unique<bool>(false));
}
std::unique_ptr<base::ListValue> CreateArgsRegister() {
- return CreateArgsInternal(base::MakeUnique<bool>(true));
+ return CreateArgsInternal(std::make_unique<bool>(true));
}
std::unique_ptr<base::ListValue> CreateArgsInternal(
diff --git a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
index 3155fdf..72bfb2f 100644
--- a/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
+++ b/chrome/browser/extensions/api/extension_action/browser_action_interactive_test.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/run_loop.h"
#include "base/test/test_timeouts.h"
#include "build/build_config.h"
@@ -95,7 +97,7 @@
// BrowserTestBase:
void SetUpOnMainThread() override {
- host_watcher_ = base::MakeUnique<ExtensionHostWatcher>();
+ host_watcher_ = std::make_unique<ExtensionHostWatcher>();
ExtensionApiTest::SetUpOnMainThread();
EXPECT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
}
diff --git a/chrome/browser/extensions/api/extension_action/extension_action_api.cc b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
index bf0c918..017614b 100644
--- a/chrome/browser/extensions/api/extension_action/extension_action_api.cc
+++ b/chrome/browser/extensions/api/extension_action/extension_action_api.cc
@@ -5,12 +5,12 @@
#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/lazy_instance.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -165,7 +165,7 @@
GetExtensionPrefs()->UpdateExtensionPref(
extension_id, kBrowserActionVisible,
- base::MakeUnique<base::Value>(visible));
+ std::make_unique<base::Value>(visible));
for (auto& observer : observers_)
observer.OnExtensionActionVisibilityChanged(extension_id, visible);
}
@@ -274,7 +274,7 @@
if (!EventRouter::Get(context))
return;
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(event_args), context);
event->user_gesture = EventRouter::USER_GESTURE_ENABLED;
EventRouter::Get(context)
@@ -516,19 +516,19 @@
ExtensionFunction::ResponseAction
ExtensionActionGetTitleFunction::RunExtensionAction() {
return RespondNow(OneArgument(
- base::MakeUnique<base::Value>(extension_action_->GetTitle(tab_id_))));
+ std::make_unique<base::Value>(extension_action_->GetTitle(tab_id_))));
}
ExtensionFunction::ResponseAction
ExtensionActionGetPopupFunction::RunExtensionAction() {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(
+ return RespondNow(OneArgument(std::make_unique<base::Value>(
extension_action_->GetPopupUrl(tab_id_).spec())));
}
ExtensionFunction::ResponseAction
ExtensionActionGetBadgeTextFunction::RunExtensionAction() {
return RespondNow(OneArgument(
- base::MakeUnique<base::Value>(extension_action_->GetBadgeText(tab_id_))));
+ std::make_unique<base::Value>(extension_action_->GetBadgeText(tab_id_))));
}
ExtensionFunction::ResponseAction
diff --git a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
index 2bad956..57c2cf5 100644
--- a/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
+++ b/chrome/browser/extensions/api/file_system/chrome_file_system_delegate.cc
@@ -12,7 +12,6 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/strings/string16.h"
#include "chrome/browser/extensions/api/file_system/file_entry_picker.h"
@@ -215,7 +214,7 @@
continue;
event_router->DispatchEventToExtension(
extension->id(),
- base::MakeUnique<Event>(
+ std::make_unique<Event>(
events::FILE_SYSTEM_ON_VOLUME_LIST_CHANGED,
file_system::OnVolumeListChanged::kEventName,
file_system::OnVolumeListChanged::Create(event_args)));
diff --git a/chrome/browser/extensions/api/font_settings/font_settings_api.cc b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
index eb57d22..e43333db 100644
--- a/chrome/browser/extensions/api/font_settings/font_settings_api.cc
+++ b/chrome/browser/extensions/api/font_settings/font_settings_api.cc
@@ -15,7 +15,6 @@
#include "base/command_line.h"
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -304,9 +303,9 @@
std::unique_ptr<base::DictionaryValue> font_name(
new base::DictionaryValue());
- font_name->Set(kFontIdKey, base::MakeUnique<base::Value>(name));
+ font_name->Set(kFontIdKey, std::make_unique<base::Value>(name));
font_name->Set(kDisplayNameKey,
- base::MakeUnique<base::Value>(localized_name));
+ std::make_unique<base::Value>(localized_name));
result->Append(std::move(font_name));
}
diff --git a/chrome/browser/extensions/api/gcm/gcm_api.cc b/chrome/browser/extensions/api/gcm/gcm_api.cc
index 7f878c3..b486d370 100644
--- a/chrome/browser/extensions/api/gcm/gcm_api.cc
+++ b/chrome/browser/extensions/api/gcm/gcm_api.cc
@@ -7,11 +7,11 @@
#include <stddef.h>
#include <algorithm>
#include <map>
+#include <memory>
#include <utility>
#include <vector>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -128,7 +128,7 @@
void GcmRegisterFunction::CompleteFunctionWithResult(
const std::string& registration_id,
gcm::GCMClient::Result result) {
- SetResult(base::MakeUnique<base::Value>(registration_id));
+ SetResult(std::make_unique<base::Value>(registration_id));
SetError(GcmResultToError(result));
SendResponse(gcm::GCMClient::SUCCESS == result);
}
@@ -182,7 +182,7 @@
void GcmSendFunction::CompleteFunctionWithResult(
const std::string& message_id,
gcm::GCMClient::Result result) {
- SetResult(base::MakeUnique<base::Value>(message_id));
+ SetResult(std::make_unique<base::Value>(message_id));
SetError(GcmResultToError(result));
SendResponse(gcm::GCMClient::SUCCESS == result);
}
diff --git a/chrome/browser/extensions/api/history/history_api.cc b/chrome/browser/extensions/api/history/history_api.cc
index fe4f312..7024cdc 100644
--- a/chrome/browser/extensions/api/history/history_api.cc
+++ b/chrome/browser/extensions/api/history/history_api.cc
@@ -173,7 +173,7 @@
const std::string& event_name,
std::unique_ptr<base::ListValue> event_args) {
if (profile && EventRouter::Get(profile)) {
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(event_args), profile);
EventRouter::Get(profile)->BroadcastEvent(std::move(event));
}
diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc
index 7a16ea87..7c80a0c 100644
--- a/chrome/browser/extensions/api/identity/identity_apitest.cc
+++ b/chrome/browser/extensions/api/identity/identity_apitest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
#include <set>
#include <string>
#include <utility>
@@ -143,7 +144,7 @@
// Provide wrappers of AsynchronousFunctionRunner for convenience.
void RunFunctionAsync(UIThreadExtensionFunction* function,
const std::string& args) {
- async_function_runner_ = base::MakeUnique<AsyncFunctionRunner>();
+ async_function_runner_ = std::make_unique<AsyncFunctionRunner>();
async_function_runner_->RunFunctionAsync(function, args,
browser()->profile());
}
@@ -299,7 +300,7 @@
void set_mint_token_result(TestOAuth2MintTokenFlow::ResultType result_type) {
set_mint_token_flow(
- base::MakeUnique<TestOAuth2MintTokenFlow>(result_type, this));
+ std::make_unique<TestOAuth2MintTokenFlow>(result_type, this));
}
void set_scope_ui_failure(GaiaWebAuthFlow::Failure failure) {
@@ -1436,7 +1437,7 @@
scoped_refptr<FakeGetAuthTokenFunction> func(new FakeGetAuthTokenFunction());
func->set_extension(extension.get());
- func->set_mint_token_flow(base::MakeUnique<TestHangOAuth2MintTokenFlow>());
+ func->set_mint_token_flow(std::make_unique<TestHangOAuth2MintTokenFlow>());
RunFunctionAsync(func.get(), "[{\"interactive\": false}]");
// After the request is canceled, the function will complete.
@@ -1952,8 +1953,8 @@
// Set up fake install attributes to make the device appeared as
// enterprise-managed.
- std::unique_ptr<chromeos::StubInstallAttributes> attributes
- = base::MakeUnique<chromeos::StubInstallAttributes>();
+ std::unique_ptr<chromeos::StubInstallAttributes> attributes =
+ std::make_unique<chromeos::StubInstallAttributes>();
attributes->SetCloudManaged("example.com", "fake-id");
policy::BrowserPolicyConnectorChromeOS::SetInstallAttributesForTesting(
attributes.release());
@@ -2237,7 +2238,7 @@
// chrome.identity.onSignInEventChanged() API.
void AddExpectedEvent(std::unique_ptr<base::ListValue> args) {
expected_events_.insert(
- base::MakeUnique<Event>(events::IDENTITY_ON_SIGN_IN_CHANGED,
+ std::make_unique<Event>(events::IDENTITY_ON_SIGN_IN_CHANGED,
api::identity::OnSignInChanged::kEventName,
std::move(args), browser()->profile()));
}
diff --git a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
index 27991bd..3d31a6e 100644
--- a/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
+++ b/chrome/browser/extensions/api/identity/identity_get_auth_token_function.cc
@@ -235,7 +235,7 @@
void IdentityGetAuthTokenFunction::CompleteFunctionWithResult(
const std::string& access_token) {
- SetResult(base::MakeUnique<base::Value>(access_token));
+ SetResult(std::make_unique<base::Value>(access_token));
CompleteAsyncRun(true);
}
diff --git a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc
index 882c858b..0be6cad 100644
--- a/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc
+++ b/chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/api/identity/identity_launch_web_auth_flow_function.h"
+#include <memory>
+
#include "chrome/browser/extensions/api/identity/identity_constants.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/common/extensions/api/identity.h"
@@ -91,7 +93,7 @@
void IdentityLaunchWebAuthFlowFunction::OnAuthFlowURLChange(
const GURL& redirect_url) {
if (redirect_url.GetWithEmptyPath() == final_url_prefix_) {
- SetResult(base::MakeUnique<base::Value>(redirect_url.spec()));
+ SetResult(std::make_unique<base::Value>(redirect_url.spec()));
SendResponse(true);
if (auth_flow_)
auth_flow_.release()->DetachDelegateAndDelete();
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc
index aa4281a..d26238c 100644
--- a/chrome/browser/extensions/api/identity/web_auth_flow.cc
+++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/identity/web_auth_flow.h"
+#include <memory>
#include <utility>
#include "base/base64.h"
@@ -95,7 +96,7 @@
args->AppendString("silent");
auto event =
- base::MakeUnique<Event>(events::IDENTITY_PRIVATE_ON_WEB_FLOW_REQUEST,
+ std::make_unique<Event>(events::IDENTITY_PRIVATE_ON_WEB_FLOW_REQUEST,
identity_private::OnWebFlowRequest::kEventName,
std::move(args), profile_);
ExtensionSystem* system = ExtensionSystem::Get(profile_);
diff --git a/chrome/browser/extensions/api/image_writer_private/unzip_helper.cc b/chrome/browser/extensions/api/image_writer_private/unzip_helper.cc
index 39f27d64..e6c03d00 100644
--- a/chrome/browser/extensions/api/image_writer_private/unzip_helper.cc
+++ b/chrome/browser/extensions/api/image_writer_private/unzip_helper.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/extensions/api/image_writer_private/unzip_helper.h"
+#include <memory>
+
#include "base/files/file_util.h"
-#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "base/task_scheduler/post_task.h"
#include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
@@ -25,7 +26,7 @@
complete_callback_(complete_callback),
failure_callback_(failure_callback),
progress_callback_(progress_callback),
- zip_reader_(base::MakeUnique<zip::ZipReader>()) {}
+ zip_reader_(std::make_unique<zip::ZipReader>()) {}
UnzipHelper::~UnzipHelper() {}
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.cc b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
index f9456d8..efd57030 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/common/extensions/api/input_ime.h"
#include "content/public/browser/notification_registrar.h"
@@ -332,12 +331,12 @@
selection_start, selection_end, params.cursor,
segments, &error)) {
std::unique_ptr<base::ListValue> results =
- base::MakeUnique<base::ListValue>();
- results->Append(base::MakeUnique<base::Value>(false));
+ std::make_unique<base::ListValue>();
+ results->Append(std::make_unique<base::Value>(false));
return RespondNow(ErrorWithArguments(std::move(results), error));
}
}
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(true)));
}
ExtensionFunction::ResponseAction InputImeCommitTextFunction::Run() {
@@ -352,12 +351,12 @@
std::string error;
if (!engine->CommitText(params.context_id, params.text.c_str(), &error)) {
std::unique_ptr<base::ListValue> results =
- base::MakeUnique<base::ListValue>();
- results->Append(base::MakeUnique<base::Value>(false));
+ std::make_unique<base::ListValue>();
+ results->Append(std::make_unique<base::Value>(false));
return RespondNow(ErrorWithArguments(std::move(results), error));
}
}
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(true)));
}
ExtensionFunction::ResponseAction InputImeSendKeyEventsFunction::Run() {
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
index 254c7b0d..f9f3e29 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.cc
@@ -10,7 +10,6 @@
#include <utility>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/chromeos/input_method/input_method_engine.h"
#include "chrome/browser/chromeos/login/lock/screen_locker.h"
#include "chrome/browser/chromeos/login/session/user_session_manager.h"
@@ -164,9 +163,9 @@
return;
// Note: this is a private API event.
- auto bounds_list = base::MakeUnique<base::ListValue>();
+ auto bounds_list = std::make_unique<base::ListValue>();
for (size_t i = 0; i < bounds.size(); ++i) {
- auto bounds_value = base::MakeUnique<base::DictionaryValue>();
+ auto bounds_value = std::make_unique<base::DictionaryValue>();
bounds_value->SetInteger("x", bounds[i].x());
bounds_value->SetInteger("y", bounds[i].y());
bounds_value->SetInteger("w", bounds[i].width());
@@ -198,7 +197,7 @@
std::unique_ptr<base::ListValue> args) override {
if (event_name == input_ime::OnActivate::kEventName) {
// Send onActivate event regardless of it's listened by the IME.
- auto event = base::MakeUnique<extensions::Event>(
+ auto event = std::make_unique<extensions::Event>(
histogram_value, event_name, std::move(args), profile_);
extensions::EventRouter::Get(profile_)->DispatchEventWithLazyListener(
extension_id_, std::move(event));
@@ -226,7 +225,7 @@
}
}
- auto event = base::MakeUnique<extensions::Event>(
+ auto event = std::make_unique<extensions::Event>(
histogram_value, event_name, std::move(args), profile_);
extensions::EventRouter::Get(profile_)
->DispatchEventToExtension(extension_id_, std::move(event));
@@ -371,7 +370,7 @@
InputMethodEngine* engine = GetActiveEngine(
Profile::FromBrowserContext(browser_context()), extension_id());
if (!engine) {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(false)));
}
std::unique_ptr<ClearComposition::Params> parent_params(
@@ -382,8 +381,8 @@
std::string error;
bool success = engine->ClearComposition(params.context_id, &error);
std::unique_ptr<base::ListValue> results =
- base::MakeUnique<base::ListValue>();
- results->Append(base::MakeUnique<base::Value>(success));
+ std::make_unique<base::ListValue>();
+ results->Append(std::make_unique<base::Value>(success));
return RespondNow(success ? ArgumentList(std::move(results))
: ErrorWithArguments(std::move(results), error));
}
@@ -411,7 +410,7 @@
event_router ? event_router->GetEngine(extension_id(), params.engine_id)
: nullptr;
if (!engine) {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(false)));
}
const SetCandidateWindowProperties::Params::Parameters::Properties&
@@ -421,8 +420,8 @@
if (properties.visible &&
!engine->SetCandidateWindowVisible(*properties.visible, &error)) {
std::unique_ptr<base::ListValue> results =
- base::MakeUnique<base::ListValue>();
- results->Append(base::MakeUnique<base::Value>(false));
+ std::make_unique<base::ListValue>();
+ results->Append(std::make_unique<base::Value>(false));
return RespondNow(ErrorWithArguments(std::move(results), error));
}
@@ -468,14 +467,14 @@
engine->SetCandidateWindowProperty(properties_out);
}
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(true)));
}
ExtensionFunction::ResponseAction InputImeSetCandidatesFunction::Run() {
InputMethodEngine* engine = GetActiveEngine(
Profile::FromBrowserContext(browser_context()), extension_id());
if (!engine) {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(true)));
}
std::unique_ptr<SetCandidates::Params> parent_params(
@@ -502,8 +501,8 @@
bool success =
engine->SetCandidates(params.context_id, candidates_out, &error);
std::unique_ptr<base::ListValue> results =
- base::MakeUnique<base::ListValue>();
- results->Append(base::MakeUnique<base::Value>(success));
+ std::make_unique<base::ListValue>();
+ results->Append(std::make_unique<base::Value>(success));
return RespondNow(success ? ArgumentList(std::move(results))
: ErrorWithArguments(std::move(results), error));
}
@@ -512,7 +511,7 @@
InputMethodEngine* engine = GetActiveEngine(
Profile::FromBrowserContext(browser_context()), extension_id());
if (!engine) {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(false)));
}
std::unique_ptr<SetCursorPosition::Params> parent_params(
@@ -524,8 +523,8 @@
bool success =
engine->SetCursorPosition(params.context_id, params.candidate_id, &error);
std::unique_ptr<base::ListValue> results =
- base::MakeUnique<base::ListValue>();
- results->Append(base::MakeUnique<base::Value>(success));
+ std::make_unique<base::ListValue>();
+ results->Append(std::make_unique<base::Value>(success));
return RespondNow(success ? ArgumentList(std::move(results))
: ErrorWithArguments(std::move(results), error));
}
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
index 03ea717..11bccc7e 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.cc
@@ -10,9 +10,10 @@
#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
+#include <memory>
+
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
@@ -114,7 +115,7 @@
return;
}
- auto event = base::MakeUnique<extensions::Event>(
+ auto event = std::make_unique<extensions::Event>(
histogram_value, event_name, std::move(args), profile_);
extensions::EventRouter::Get(profile_)
->DispatchEventToExtension(extension_id_, std::move(event));
@@ -150,7 +151,7 @@
Profile* profile = Profile::FromBrowserContext(browser_context);
ExtensionPrefs::Get(profile)->UpdateExtensionPref(
extension->id(), kPrefNeverActivatedSinceLoaded,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
}
void InputImeAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
@@ -162,7 +163,7 @@
// Records the extension is not the last active IME engine.
ExtensionPrefs::Get(Profile::FromBrowserContext(browser_context))
->UpdateExtensionPref(extension->id(), kPrefLastActiveEngine,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
event_router->DeleteInputMethodEngine(extension->id());
}
}
@@ -190,7 +191,7 @@
// Records the extension is the last active IME engine.
ExtensionPrefs::Get(GetProfile())
->UpdateExtensionPref(extension_id, kPrefLastActiveEngine,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
if (active_engine_) {
if (active_engine_->GetExtensionId() == extension_id) {
active_engine_->Enable(std::string());
@@ -201,7 +202,7 @@
ExtensionPrefs::Get(GetProfile())
->UpdateExtensionPref(active_engine_->GetExtensionId(),
kPrefLastActiveEngine,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
DeleteInputMethodEngine(active_engine_->GetExtensionId());
}
@@ -253,13 +254,13 @@
event_router->SetActiveEngine(extension_id());
ExtensionPrefs::Get(profile)->UpdateExtensionPref(
extension_id(), kPrefNeverActivatedSinceLoaded,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
return RespondNow(NoArguments());
}
// The API has already been called at least once.
ExtensionPrefs::Get(profile)->UpdateExtensionPref(
extension_id(), kPrefNeverActivatedSinceLoaded,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
// Otherwise, this API is only allowed to be called from a user action.
if (!user_gesture())
@@ -321,7 +322,7 @@
// again' check box. So we can activate the extension directly next time.
ExtensionPrefs::Get(profile)->UpdateExtensionPref(
extension_id(), kPrefWarningBubbleNeverShow,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
}
Respond(NoArguments());
@@ -379,7 +380,7 @@
return RespondNow(Error(error));
std::unique_ptr<base::DictionaryValue> result(new base::DictionaryValue());
- result->Set("frameId", base::MakeUnique<base::Value>(frame_id));
+ result->Set("frameId", std::make_unique<base::Value>(frame_id));
return RespondNow(OneArgument(std::move(result)));
}
diff --git a/chrome/browser/extensions/api/instance_id/instance_id_api.cc b/chrome/browser/extensions/api/instance_id/instance_id_api.cc
index 0a897d4..bb844a69 100644
--- a/chrome/browser/extensions/api/instance_id/instance_id_api.cc
+++ b/chrome/browser/extensions/api/instance_id/instance_id_api.cc
@@ -4,8 +4,9 @@
#include "chrome/browser/extensions/api/instance_id/instance_id_api.h"
+#include <memory>
+
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "chrome/browser/gcm/instance_id/instance_id_profile_service.h"
#include "chrome/browser/gcm/instance_id/instance_id_profile_service_factory.h"
@@ -95,7 +96,7 @@
}
void InstanceIDGetIDFunction::GetIDCompleted(const std::string& id) {
- Respond(OneArgument(base::MakeUnique<base::Value>(id)));
+ Respond(OneArgument(std::make_unique<base::Value>(id)));
}
InstanceIDGetCreationTimeFunction::InstanceIDGetCreationTimeFunction() {}
@@ -112,7 +113,7 @@
void InstanceIDGetCreationTimeFunction::GetCreationTimeCompleted(
const base::Time& creation_time) {
Respond(
- OneArgument(base::MakeUnique<base::Value>(creation_time.ToDoubleT())));
+ OneArgument(std::make_unique<base::Value>(creation_time.ToDoubleT())));
}
InstanceIDGetTokenFunction::InstanceIDGetTokenFunction() {}
@@ -141,7 +142,7 @@
const std::string& token,
instance_id::InstanceID::Result result) {
if (result == instance_id::InstanceID::SUCCESS)
- Respond(OneArgument(base::MakeUnique<base::Value>(token)));
+ Respond(OneArgument(std::make_unique<base::Value>(token)));
else
Respond(Error(InstanceIDResultToError(result)));
}
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
index 8aab12b..e42d686 100644
--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
+++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
@@ -13,7 +13,6 @@
#include <vector>
#include "base/feature_list.h"
-#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_split.h"
@@ -447,7 +446,7 @@
SpellcheckServiceFactory::GetForContext(browser_context());
bool success = service->GetCustomDictionary()->AddWord(params->word);
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(success)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(success)));
}
LanguageSettingsPrivateRemoveSpellcheckWordFunction::
@@ -466,7 +465,7 @@
SpellcheckServiceFactory::GetForContext(browser_context());
bool success = service->GetCustomDictionary()->RemoveWord(params->word);
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(success)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(success)));
}
LanguageSettingsPrivateGetTranslateTargetLanguageFunction::
@@ -483,7 +482,7 @@
language::LanguageModel* language_model =
LanguageModelFactory::GetForBrowserContext(profile);
return RespondNow(OneArgument(
- base::MakeUnique<base::Value>(TranslateService::GetTargetLanguage(
+ std::make_unique<base::Value>(TranslateService::GetTargetLanguage(
profile->GetPrefs(), language_model))));
}
diff --git a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
index 55f14f4..8b7bb3f 100644
--- a/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
+++ b/chrome/browser/extensions/api/management/chrome_management_api_delegate.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/extensions/api/management/chrome_management_api_delegate.h"
+#include <memory>
+
#include "base/callback_helpers.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/bookmark_app_helper.h"
#include "chrome/browser/extensions/chrome_extension_function_details.h"
@@ -60,7 +61,7 @@
OnInstallPromptDone,
weak_factory_.GetWeakPtr()),
extension, nullptr,
- base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
+ std::make_unique<ExtensionInstallPrompt::Prompt>(type),
ExtensionInstallPrompt::GetDefaultShowDialogCallback());
}
~ManagementSetEnabledFunctionInstallPromptDelegate() override {}
diff --git a/chrome/browser/extensions/api/management/management_api_unittest.cc b/chrome/browser/extensions/api/management/management_api_unittest.cc
index 40f47016..1551841 100644
--- a/chrome/browser/extensions/api/management/management_api_unittest.cc
+++ b/chrome/browser/extensions/api/management/management_api_unittest.cc
@@ -37,12 +37,12 @@
std::unique_ptr<KeyedService> BuildManagementApi(
content::BrowserContext* context) {
- return base::MakeUnique<ManagementAPI>(context);
+ return std::make_unique<ManagementAPI>(context);
}
std::unique_ptr<KeyedService> BuildEventRouter(
content::BrowserContext* profile) {
- return base::MakeUnique<extensions::EventRouter>(
+ return std::make_unique<extensions::EventRouter>(
profile, ExtensionPrefs::Get(profile));
}
diff --git a/chrome/browser/extensions/api/mdns/mdns_api.cc b/chrome/browser/extensions/api/mdns/mdns_api.cc
index 4d28c195..2bf04ff 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_api.cc
@@ -173,7 +173,7 @@
}
std::unique_ptr<base::ListValue> results = mdns::OnServiceList::Create(args);
- auto event = base::MakeUnique<Event>(events::MDNS_ON_SERVICE_LIST,
+ auto event = std::make_unique<Event>(events::MDNS_ON_SERVICE_LIST,
mdns::OnServiceList::kEventName,
std::move(results), browser_context_);
event->filter_info.service_type = service_type;
diff --git a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
index 2c6c5c5..a74ce67 100644
--- a/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_api_unittest.cc
@@ -10,7 +10,6 @@
#include <utility>
#include <vector>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h"
@@ -74,17 +73,17 @@
std::unique_ptr<KeyedService> MockedMDnsAPITestingFactoryFunction(
content::BrowserContext* context) {
- return base::MakeUnique<MockedMDnsAPI>(context);
+ return std::make_unique<MockedMDnsAPI>(context);
}
std::unique_ptr<KeyedService> MDnsAPITestingFactoryFunction(
content::BrowserContext* context) {
- return base::MakeUnique<MDnsAPI>(context);
+ return std::make_unique<MDnsAPI>(context);
}
std::unique_ptr<KeyedService> BuildEventRouter(
content::BrowserContext* context) {
- return base::MakeUnique<extensions::EventRouter>(
+ return std::make_unique<extensions::EventRouter>(
context, ExtensionPrefs::Get(context));
}
@@ -109,7 +108,7 @@
std::unique_ptr<KeyedService> MockEventRouterFactoryFunction(
content::BrowserContext* context) {
- return base::MakeUnique<MockEventRouter>(context,
+ return std::make_unique<MockEventRouter>(context,
ExtensionPrefs::Get(context));
}
@@ -187,7 +186,7 @@
ASSERT_TRUE(EventRouter::Get(browser_context())); // constructs EventRouter
registry_ =
- base::MakeUnique<MockDnsSdRegistry>(MDnsAPI::Get(browser_context()));
+ std::make_unique<MockDnsSdRegistry>(MDnsAPI::Get(browser_context()));
EXPECT_CALL(*dns_sd_registry(),
AddObserver(MDnsAPI::Get(browser_context())))
.Times(1);
@@ -225,7 +224,7 @@
// Setting app.background.page = "background.html" is sufficient to make
// the extension type TYPE_PLATFORM_APP.
manifest.Set(extensions::manifest_keys::kPlatformAppBackgroundPage,
- base::MakeUnique<base::Value>("background.html"));
+ std::make_unique<base::Value>("background.html"));
}
std::string error;
diff --git a/chrome/browser/extensions/api/mdns/mdns_apitest.cc b/chrome/browser/extensions/api/mdns/mdns_apitest.cc
index 2d241e4..48bcf21 100644
--- a/chrome/browser/extensions/api/mdns/mdns_apitest.cc
+++ b/chrome/browser/extensions/api/mdns/mdns_apitest.cc
@@ -2,8 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/api/mdns/mdns_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -35,7 +36,7 @@
void SetUpTestDnsSdRegistry() {
extensions::MDnsAPI* api = extensions::MDnsAPI::Get(profile());
- dns_sd_registry_ = base::MakeUnique<media_router::MockDnsSdRegistry>(api);
+ dns_sd_registry_ = std::make_unique<media_router::MockDnsSdRegistry>(api);
EXPECT_CALL(*dns_sd_registry_, AddObserver(api))
.Times(1);
api->SetDnsSdRegistryForTesting(dns_sd_registry_.get());
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
index 1263722..f672a28 100644
--- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
+++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc
@@ -709,7 +709,7 @@
}
result_dictionary->Set(kAttachedImagesBlobInfoKey,
- base::MakeUnique<base::ListValue>());
+ std::make_unique<base::ListValue>());
metadata::AttachedImage* first_image = &attached_images->front();
content::BrowserContext::CreateMemoryBackedBlob(
GetProfile(), first_image->data.c_str(), first_image->data.size(), "",
diff --git a/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc b/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
index d564de69..eeaa819 100644
--- a/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
+++ b/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/extensions/api/messaging/chrome_messaging_delegate.h"
+#include <memory>
+
#include "base/callback.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/api/messaging/incognito_connectability.h"
#include "chrome/browser/extensions/api/messaging/native_message_port.h"
@@ -113,7 +114,7 @@
if (!receiver_rfh)
return nullptr;
- return base::MakeUnique<ExtensionMessagePort>(
+ return std::make_unique<ExtensionMessagePort>(
channel_delegate, receiver_port_id, extension_id, receiver_rfh,
include_child_frames);
}
@@ -133,7 +134,7 @@
native_view, extension_id, native_app_name, allow_user_level, error_out);
if (!native_host.get())
return nullptr;
- return base::MakeUnique<NativeMessagePort>(channel_delegate, receiver_port_id,
+ return std::make_unique<NativeMessagePort>(channel_delegate, receiver_port_id,
std::move(native_host));
}
diff --git a/chrome/browser/extensions/api/module/module.cc b/chrome/browser/extensions/api/module/module.cc
index b3874b88..469c1a2 100644
--- a/chrome/browser/extensions/api/module/module.cc
+++ b/chrome/browser/extensions/api/module/module.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/extensions/api/module/module.h"
+#include <memory>
#include <string>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_util.h"
@@ -48,19 +48,19 @@
ExtensionPrefs::Get(browser_context())
->UpdateExtensionPref(extension_id(), extension::kUpdateURLData,
- base::MakeUnique<base::Value>(data));
+ std::make_unique<base::Value>(data));
return RespondNow(NoArguments());
}
ExtensionFunction::ResponseAction
ExtensionIsAllowedIncognitoAccessFunction::Run() {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(
+ return RespondNow(OneArgument(std::make_unique<base::Value>(
util::IsIncognitoEnabled(extension_id(), browser_context()))));
}
ExtensionFunction::ResponseAction
ExtensionIsAllowedFileSchemeAccessFunction::Run() {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(
+ return RespondNow(OneArgument(std::make_unique<base::Value>(
util::AllowFileAccess(extension_id(), browser_context()))));
}
diff --git a/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc b/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc
index 341e4cb..253b8944 100644
--- a/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc
+++ b/chrome/browser/extensions/api/music_manager_private/music_manager_private_api.cc
@@ -4,7 +4,8 @@
#include "chrome/browser/extensions/api/music_manager_private/music_manager_private_api.h"
-#include "base/memory/ptr_util.h"
+#include <memory>
+
#include "chrome/browser/extensions/api/music_manager_private/device_id.h"
using content::BrowserThread;
@@ -45,7 +46,7 @@
SetError(kDeviceIdNotSupported);
response = false;
} else {
- SetResult(base::MakeUnique<base::Value>(device_id));
+ SetResult(std::make_unique<base::Value>(device_id));
response = true;
}
diff --git a/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_api.cc b/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_api.cc
index 3fe6234..241bcff 100644
--- a/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_api.cc
+++ b/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_api.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/bind.h"
-#include "base/memory/ptr_util.h"
#include "chrome/common/extensions/api/networking_cast_private.h"
#include "extensions/browser/api/extensions_api_client.h"
#include "extensions/browser/api/networking_private/networking_cast_private_delegate.h"
@@ -47,7 +46,7 @@
std::unique_ptr<NetworkingCastPrivateDelegate::Credentials> AsCastCredentials(
api::networking_cast_private::VerificationProperties& properties) {
- return base::MakeUnique<NetworkingCastPrivateDelegate::Credentials>(
+ return std::make_unique<NetworkingCastPrivateDelegate::Credentials>(
properties.certificate,
properties.intermediate_certificates
? *properties.intermediate_certificates
diff --git a/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_apitest.cc b/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_apitest.cc
index 7eed80d..b2f52e0 100644
--- a/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_cast_private/networking_cast_private_apitest.cc
@@ -10,7 +10,6 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/browser_process.h"
@@ -139,7 +138,7 @@
private:
std::unique_ptr<ChromeNetworkingCastPrivateDelegate>
CreateNetworkingCastPrivateDelegate() {
- return base::MakeUnique<TestNetworkingCastPrivateDelegate>();
+ return std::make_unique<TestNetworkingCastPrivateDelegate>();
}
ChromeNetworkingCastPrivateDelegate::FactoryCallback
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
index 642d7a17..8fd35c3 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_apitest.cc
@@ -14,7 +14,6 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/api/networking_cast_private/chrome_networking_cast_private_delegate.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -197,11 +196,11 @@
}
std::unique_ptr<base::DictionaryValue> GetGlobalPolicy() override {
- return base::MakeUnique<base::DictionaryValue>();
+ return std::make_unique<base::DictionaryValue>();
}
std::unique_ptr<base::DictionaryValue> GetCertificateLists() override {
- return base::MakeUnique<base::DictionaryValue>();
+ return std::make_unique<base::DictionaryValue>();
}
bool EnableNetworkType(const std::string& type) override {
@@ -395,14 +394,14 @@
private:
std::unique_ptr<ChromeNetworkingCastPrivateDelegate>
CreateTestNetworkingCastPrivateDelegate(bool test_failure) {
- return base::MakeUnique<TestNetworkingCastPrivateDelegate>(test_failure);
+ return std::make_unique<TestNetworkingCastPrivateDelegate>(test_failure);
}
std::unique_ptr<KeyedService> CreateTestNetworkingPrivateDelegate(
bool test_failure) {
CHECK(!networking_private_delegate_);
auto delegate =
- base::MakeUnique<TestNetworkingPrivateDelegate>(test_failure);
+ std::make_unique<TestNetworkingPrivateDelegate>(test_failure);
networking_private_delegate_ = delegate.get();
return delegate;
}
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
index 8ec3206c..742eda5 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc
@@ -490,7 +490,7 @@
std::unique_ptr<ChromeNetworkingCastPrivateDelegate>
CreateNetworkingCastPrivateDelegate() {
- return base::MakeUnique<TestNetworkingCastPrivateDelegate>();
+ return std::make_unique<TestNetworkingCastPrivateDelegate>();
}
bool SetupCertificates() {
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc b/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc
index a50e5718..6b2b32b 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc
@@ -9,7 +9,6 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/networking_cast_private/chrome_networking_cast_private_delegate.h"
#include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h"
@@ -148,7 +147,7 @@
private:
std::unique_ptr<ChromeNetworkingCastPrivateDelegate>
CreateNetworkingCastPrivateDelegate() {
- return base::MakeUnique<TestNetworkingCastPrivateDelegate>();
+ return std::make_unique<TestNetworkingCastPrivateDelegate>();
}
ChromeNetworkingCastPrivateDelegate::FactoryCallback
diff --git a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc
index 9d4b6c5..f4ec25d 100644
--- a/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc
+++ b/chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.cc
@@ -4,7 +4,8 @@
#include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h"
-#include "base/memory/ptr_util.h"
+#include <memory>
+
#include "build/build_config.h"
#if defined(OS_CHROMEOS)
@@ -22,7 +23,7 @@
std::unique_ptr<NetworkingPrivateDelegate::UIDelegate>
NetworkingPrivateUIDelegateFactoryImpl::CreateDelegate() {
#if defined(OS_CHROMEOS)
- return base::MakeUnique<
+ return std::make_unique<
chromeos::extensions::NetworkingPrivateUIDelegateChromeOS>();
#else
return nullptr;
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index b79d74b..fb63bc5 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/callback.h"
#include "base/guid.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/rand_util.h"
#include "base/strings/string_number_conversions.h"
@@ -602,7 +602,7 @@
notification_id = base::RandBytesAsString(16);
}
- SetResult(base::MakeUnique<base::Value>(notification_id));
+ SetResult(std::make_unique<base::Value>(notification_id));
// TODO(crbug.com/749402): Cap the length of notification Ids to a certain
// limit if the histogram indicates that this is safe to do.
@@ -635,7 +635,7 @@
CreateScopedIdentifier(extension_->id(), params_->notification_id));
if (!matched_notification) {
- SetResult(base::MakeUnique<base::Value>(false));
+ SetResult(std::make_unique<base::Value>(false));
SendResponse(true);
return true;
}
@@ -649,7 +649,7 @@
// TODO(dewittj): Add more human-readable error strings if this fails.
bool could_update_notification = UpdateNotification(
params_->notification_id, ¶ms_->options, ¬ification);
- SetResult(base::MakeUnique<base::Value>(could_update_notification));
+ SetResult(std::make_unique<base::Value>(could_update_notification));
if (!could_update_notification)
return false;
@@ -672,7 +672,7 @@
bool cancel_result = GetDisplayHelper()->Close(
CreateScopedIdentifier(extension_->id(), params_->notification_id));
- SetResult(base::MakeUnique<base::Value>(cancel_result));
+ SetResult(std::make_unique<base::Value>(cancel_result));
SendResponse(true);
return true;
@@ -717,7 +717,7 @@
: api::notifications::PERMISSION_LEVEL_DENIED;
SetResult(
- base::MakeUnique<base::Value>(api::notifications::ToString(result)));
+ std::make_unique<base::Value>(api::notifications::ToString(result)));
SendResponse(true);
return true;
diff --git a/chrome/browser/extensions/api/notifications/notifications_apitest.cc b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
index b3d67e6..6b34b68c 100644
--- a/chrome/browser/extensions/api/notifications/notifications_apitest.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_apitest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/containers/circular_deque.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
@@ -175,7 +177,7 @@
DCHECK(profile());
display_service_tester_ =
- base::MakeUnique<NotificationDisplayServiceTester>(profile());
+ std::make_unique<NotificationDisplayServiceTester>(profile());
}
void TearDownOnMainThread() override {
diff --git a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
index b4efefb..18816b55 100644
--- a/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
+++ b/chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl_unittest.cc
@@ -11,7 +11,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -181,7 +180,7 @@
EXPECT_EQ(0u, tracker.call_count());
PasswordFormList list;
- list.push_back(base::MakeUnique<autofill::PasswordForm>());
+ list.push_back(std::make_unique<autofill::PasswordForm>());
delegate.SetPasswordList(list);
EXPECT_EQ(1u, tracker.call_count());
@@ -198,7 +197,7 @@
EXPECT_EQ(0u, tracker.call_count());
PasswordFormList list;
- list.push_back(base::MakeUnique<autofill::PasswordForm>());
+ list.push_back(std::make_unique<autofill::PasswordForm>());
delegate.SetPasswordExceptionList(list);
EXPECT_EQ(1u, tracker.call_count());
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index 3b52c73..d78cf8f3d 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/api/permissions/permissions_api_helpers.h"
#include "chrome/browser/extensions/extension_management.h"
@@ -234,8 +233,9 @@
install_ui_.reset(new ExtensionInstallPrompt(GetAssociatedWebContents()));
install_ui_->ShowDialog(
base::Bind(&PermissionsRequestFunction::OnInstallPromptDone, this),
- extension(), nullptr, base::MakeUnique<ExtensionInstallPrompt::Prompt>(
- ExtensionInstallPrompt::PERMISSIONS_PROMPT),
+ extension(), nullptr,
+ std::make_unique<ExtensionInstallPrompt::Prompt>(
+ ExtensionInstallPrompt::PERMISSIONS_PROMPT),
requested_permissions_->Clone(),
ExtensionInstallPrompt::GetDefaultShowDialogCallback());
}
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
index 7632c692..d50b84f 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers.cc
@@ -8,7 +8,6 @@
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/common/extensions/api/permissions.h"
#include "extensions/common/error_utils.h"
@@ -146,7 +145,7 @@
}
}
- return base::MakeUnique<PermissionSet>(apis, manifest_permissions, origins,
+ return std::make_unique<PermissionSet>(apis, manifest_permissions, origins,
URLPatternSet());
}
diff --git a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
index b99b3efc..a1705a9 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api_helpers_unittest.cc
@@ -10,7 +10,6 @@
#include <utility>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/common/extensions/api/permissions.h"
#include "extensions/common/permissions/permission_set.h"
@@ -142,14 +141,14 @@
{
Permissions permissions_object;
value->Clear();
- value->Set("origins", base::MakeUnique<base::Value>(2));
+ value->Set("origins", std::make_unique<base::Value>(2));
EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
}
{
Permissions permissions_object;
value->Clear();
- value->Set("permissions", base::MakeUnique<base::Value>(2));
+ value->Set("permissions", std::make_unique<base::Value>(2));
EXPECT_FALSE(Permissions::Populate(*value, &permissions_object));
}
@@ -158,7 +157,7 @@
Permissions permissions_object;
value->Clear();
value->Set("origins", origins->CreateDeepCopy());
- value->Set("random", base::MakeUnique<base::Value>(3));
+ value->Set("random", std::make_unique<base::Value>(3));
EXPECT_TRUE(Permissions::Populate(*value, &permissions_object));
permissions = UnpackPermissionSet(permissions_object, true, &error);
EXPECT_TRUE(permissions.get());
diff --git a/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc b/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc
index 73d502c..fe1d003 100644
--- a/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc
+++ b/chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc
@@ -397,7 +397,7 @@
// To verify that the user is not prompted for any certificate selection,
// set up a delegate that fails on any invocation.
GetPlatformKeysService()->SetSelectDelegate(
- base::MakeUnique<TestSelectDelegate>(net::CertificateList()));
+ std::make_unique<TestSelectDelegate>(net::CertificateList()));
ASSERT_TRUE(RunExtensionTest("managedProfile")) << message_;
}
@@ -434,7 +434,7 @@
certs.push_back(client_cert1_);
GetPlatformKeysService()->SetSelectDelegate(
- base::MakeUnique<TestSelectDelegate>(certs));
+ std::make_unique<TestSelectDelegate>(certs));
ASSERT_TRUE(RunExtensionTest("corporateKeyWithPermissionTests")) << message_;
}
@@ -445,7 +445,7 @@
// As the profile is managed, the user must not be able to grant any
// certificate permission. Set up a delegate that fails on any invocation.
GetPlatformKeysService()->SetSelectDelegate(
- base::MakeUnique<TestSelectDelegate>(net::CertificateList()));
+ std::make_unique<TestSelectDelegate>(net::CertificateList()));
ASSERT_TRUE(RunExtensionTest("policyDoesGrantAccessToNonCorporateKey"))
<< message_;
diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
index 28298d85..e6ce843 100644
--- a/chrome/browser/extensions/api/preference/preference_api.cc
+++ b/chrome/browser/extensions/api/preference/preference_api.cc
@@ -12,7 +12,6 @@
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "base/strings/stringprintf.h"
#include "base/values.h"
@@ -207,7 +206,7 @@
bool bool_value = false;
bool result = value->GetAsBoolean(&bool_value);
DCHECK(result);
- return base::MakeUnique<base::Value>(!bool_value);
+ return std::make_unique<base::Value>(!bool_value);
}
};
@@ -221,10 +220,10 @@
const bool pref_found = extension_pref->GetAsBoolean(&bool_value);
DCHECK(pref_found) << "Preference not found.";
if (bool_value) {
- return base::MakeUnique<base::Value>(
+ return std::make_unique<base::Value>(
chrome_browser_net::NETWORK_PREDICTION_DEFAULT);
}
- return base::MakeUnique<base::Value>(
+ return std::make_unique<base::Value>(
chrome_browser_net::NETWORK_PREDICTION_NEVER);
}
@@ -233,7 +232,7 @@
int int_value = chrome_browser_net::NETWORK_PREDICTION_DEFAULT;
const bool pref_found = browser_pref->GetAsInteger(&int_value);
DCHECK(pref_found) << "Preference not found.";
- return base::MakeUnique<base::Value>(
+ return std::make_unique<base::Value>(
int_value != chrome_browser_net::NETWORK_PREDICTION_NEVER);
}
};
@@ -294,11 +293,11 @@
DCHECK_EQ(arraysize(kPrefMapping), mapping_.size());
DCHECK_EQ(arraysize(kPrefMapping), event_mapping_.size());
RegisterPrefTransformer(proxy_config::prefs::kProxy,
- base::MakeUnique<ProxyPrefTransformer>());
+ std::make_unique<ProxyPrefTransformer>());
RegisterPrefTransformer(prefs::kBlockThirdPartyCookies,
- base::MakeUnique<InvertBooleanTransformer>());
+ std::make_unique<InvertBooleanTransformer>());
RegisterPrefTransformer(prefs::kNetworkPredictionOptions,
- base::MakeUnique<NetworkPredictionTransformer>());
+ std::make_unique<NetworkPredictionTransformer>());
}
~PrefMapping() {
diff --git a/chrome/browser/extensions/api/preference/preference_helpers.cc b/chrome/browser/extensions/api/preference/preference_helpers.cc
index 15b5d34..3414501 100644
--- a/chrome/browser/extensions/api/preference/preference_helpers.cc
+++ b/chrome/browser/extensions/api/preference/preference_helpers.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/preference/preference_helpers.h"
+#include <memory>
#include <utility>
#include "base/json/json_writer.h"
@@ -127,7 +128,7 @@
std::unique_ptr<base::ListValue> args_copy(args->DeepCopy());
auto event =
- base::MakeUnique<Event>(histogram_value, event_name,
+ std::make_unique<Event>(histogram_value, event_name,
std::move(args_copy), restrict_to_profile);
router->DispatchEventToExtension(extension->id(), std::move(event));
}
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
index c763930..780aafee 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -18,7 +18,6 @@
#include <utility>
#include "base/base64.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_tokenizer.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -367,7 +366,7 @@
ProxyPrefs::ProxyMode mode;
CHECK(proxy_config.GetMode(&mode) && mode == ProxyPrefs::MODE_FIXED_SERVERS);
- auto extension_proxy_rules = base::MakeUnique<base::DictionaryValue>();
+ auto extension_proxy_rules = std::make_unique<base::DictionaryValue>();
std::string proxy_servers;
if (!proxy_config.GetProxyServer(&proxy_servers)) {
@@ -434,7 +433,7 @@
std::unique_ptr<base::DictionaryValue> CreateProxyServerDict(
const net::ProxyServer& proxy) {
- auto out = base::MakeUnique<base::DictionaryValue>();
+ auto out = std::make_unique<base::DictionaryValue>();
switch (proxy.scheme()) {
case net::ProxyServer::SCHEME_HTTP:
out->SetString(keys::kProxyConfigRuleScheme, "http");
@@ -466,7 +465,7 @@
ProxyPrefs::ProxyMode mode;
CHECK(proxy_config.GetMode(&mode) && mode == ProxyPrefs::MODE_PAC_SCRIPT);
- auto pac_script_dict = base::MakeUnique<base::DictionaryValue>();
+ auto pac_script_dict = std::make_unique<base::DictionaryValue>();
std::string pac_url;
if (!proxy_config.GetPacUrl(&pac_url)) {
LOG(ERROR) << "Invalid proxy configuration. Missing PAC URL.";
@@ -496,7 +495,7 @@
std::unique_ptr<base::ListValue> TokenizeToStringList(
const std::string& in,
const std::string& delims) {
- auto out = base::MakeUnique<base::ListValue>();
+ auto out = std::make_unique<base::ListValue>();
base::StringTokenizer entries(in, delims);
while (entries.GetNext())
out->AppendString(entries.token());
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc
index be4c9da..85ff8016 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers_unittest.cc
@@ -9,7 +9,6 @@
#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/proxy/proxy_api_constants.h"
#include "components/proxy_config/proxy_config_dictionary.h"
@@ -33,7 +32,7 @@
// extension API.
std::unique_ptr<base::DictionaryValue> CreateTestProxyServerDict(
const std::string& host) {
- auto dict = base::MakeUnique<base::DictionaryValue>();
+ auto dict = std::make_unique<base::DictionaryValue>();
dict->SetString(keys::kProxyConfigRuleHost, host);
return dict;
}
@@ -44,7 +43,7 @@
const std::string& schema,
const std::string& host,
int port) {
- auto dict = base::MakeUnique<base::DictionaryValue>();
+ auto dict = std::make_unique<base::DictionaryValue>();
dict->SetString(keys::kProxyConfigRuleScheme, schema);
dict->SetString(keys::kProxyConfigRuleHost, host);
dict->SetInteger(keys::kProxyConfigRulePort, port);
@@ -119,7 +118,7 @@
EXPECT_FALSE(bad_message);
// Set up a pac script.
- auto pacScriptDict = base::MakeUnique<base::DictionaryValue>();
+ auto pacScriptDict = std::make_unique<base::DictionaryValue>();
pacScriptDict->SetString(keys::kProxyConfigPacScriptUrl, kSamplePacScriptUrl);
proxy_config.Set(keys::kProxyConfigPacScript, std::move(pacScriptDict));
@@ -148,7 +147,7 @@
EXPECT_FALSE(bad_message);
// Set up a PAC script.
- auto pacScriptDict = base::MakeUnique<base::DictionaryValue>();
+ auto pacScriptDict = std::make_unique<base::DictionaryValue>();
pacScriptDict->SetString(keys::kProxyConfigPacScriptData, kSamplePacScript);
proxy_config.Set(keys::kProxyConfigPacScript, std::move(pacScriptDict));
@@ -177,7 +176,7 @@
EXPECT_EQ(std::string(), out);
EXPECT_EQ(std::string(), error);
- auto proxy_rules = base::MakeUnique<base::DictionaryValue>();
+ auto proxy_rules = std::make_unique<base::DictionaryValue>();
proxy_rules->Set(keys::field_name[1], CreateTestProxyServerDict("proxy1"));
proxy_rules->Set(keys::field_name[2], CreateTestProxyServerDict("proxy2"));
proxy_config.Set(keys::kProxyConfigRules, std::move(proxy_rules));
@@ -209,10 +208,10 @@
EXPECT_EQ(std::string(), error);
EXPECT_FALSE(bad_message);
- auto bypass_list = base::MakeUnique<base::ListValue>();
+ auto bypass_list = std::make_unique<base::ListValue>();
bypass_list->AppendString("host1");
bypass_list->AppendString("host2");
- auto proxy_rules = base::MakeUnique<base::DictionaryValue>();
+ auto proxy_rules = std::make_unique<base::DictionaryValue>();
proxy_rules->Set(keys::kProxyConfigBypassList, std::move(bypass_list));
proxy_config.Set(keys::kProxyConfigRules, std::move(proxy_rules));
@@ -330,7 +329,7 @@
CreateTestProxyServerDict("http", "proxy3", 80));
expected->Set("fallbackProxy",
CreateTestProxyServerDict("socks4", "proxy4", 80));
- auto bypass_list = base::MakeUnique<base::ListValue>();
+ auto bypass_list = std::make_unique<base::ListValue>();
bypass_list->AppendString("localhost");
expected->Set(keys::kProxyConfigBypassList, std::move(bypass_list));
@@ -358,7 +357,7 @@
CreateTestProxyServerDict("http", "proxy3", 80));
expected->Set("fallbackProxy",
CreateTestProxyServerDict("socks4", "proxy4", 80));
- auto bypass_list = base::MakeUnique<base::ListValue>();
+ auto bypass_list = std::make_unique<base::ListValue>();
bypass_list->AppendString("localhost");
expected->Set(keys::kProxyConfigBypassList, std::move(bypass_list));
diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
index 355d8f5..f005de4ad 100644
--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
+++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate_unittest.cc
@@ -9,7 +9,6 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/location.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
@@ -64,7 +63,7 @@
std::unique_ptr<KeyedService> TestEventRouterFactoryFunction(
content::BrowserContext* context) {
- return base::MakeUnique<TestEventRouter>(context);
+ return std::make_unique<TestEventRouter>(context);
}
// This class lets us intercept extension update checks and respond as if
@@ -160,7 +159,7 @@
void OnResult(const RuntimeAPIDelegate::UpdateCheckResult& result) {
EXPECT_EQ(nullptr, result_.get());
- result_ = base::MakeUnique<RuntimeAPIDelegate::UpdateCheckResult>(
+ result_ = std::make_unique<RuntimeAPIDelegate::UpdateCheckResult>(
result.success, result.response, result.version);
if (run_loop_)
run_loop_->Quit();
@@ -168,7 +167,7 @@
std::unique_ptr<RuntimeAPIDelegate::UpdateCheckResult> WaitForResult() {
if (!result_) {
- run_loop_ = base::MakeUnique<base::RunLoop>();
+ run_loop_ = std::make_unique<base::RunLoop>();
run_loop_->Run();
}
return std::move(result_);
@@ -192,14 +191,14 @@
InitializeExtensionServiceWithUpdater();
runtime_delegate_ =
- base::MakeUnique<ChromeRuntimeAPIDelegate>(browser_context());
+ std::make_unique<ChromeRuntimeAPIDelegate>(browser_context());
service()->updater()->SetExtensionCacheForTesting(nullptr);
EventRouterFactory::GetInstance()->SetTestingFactory(
browser_context(), &TestEventRouterFactoryFunction);
// Setup the ExtensionService so that extension updates won't complete
// installation until the extension is idle.
- update_install_gate_ = base::MakeUnique<UpdateInstallGate>(service());
+ update_install_gate_ = std::make_unique<UpdateInstallGate>(service());
service()->RegisterInstallGate(ExtensionPrefs::DELAY_REASON_WAIT_FOR_IDLE,
update_install_gate_.get());
static_cast<TestExtensionSystem*>(ExtensionSystem::Get(browser_context()))
diff --git a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
index 6eb32c1c..c2bef6db 100644
--- a/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
+++ b/chrome/browser/extensions/api/screenlock_private/screenlock_private_api.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/signin/chrome_proximity_auth_client.h"
@@ -56,7 +55,7 @@
ScreenlockPrivateGetLockedFunction::~ScreenlockPrivateGetLockedFunction() {}
bool ScreenlockPrivateGetLockedFunction::RunAsync() {
- SetResult(base::MakeUnique<base::Value>(
+ SetResult(std::make_unique<base::Value>(
proximity_auth::ScreenlockBridge::Get()->IsLocked()));
SendResponse(error_.empty());
return true;
@@ -121,14 +120,14 @@
proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type) {
DispatchEvent(events::SCREENLOCK_PRIVATE_ON_CHANGED,
screenlock::OnChanged::kEventName,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
}
void ScreenlockPrivateEventRouter::OnScreenDidUnlock(
proximity_auth::ScreenlockBridge::LockHandler::ScreenType screen_type) {
DispatchEvent(events::SCREENLOCK_PRIVATE_ON_CHANGED,
screenlock::OnChanged::kEventName,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
}
void ScreenlockPrivateEventRouter::OnFocusedUserChanged(
diff --git a/chrome/browser/extensions/api/sessions/sessions_api.cc b/chrome/browser/extensions/api/sessions/sessions_api.cc
index 1c372a7..aba5cc99 100644
--- a/chrome/browser/extensions/api/sessions/sessions_api.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_api.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include <vector>
#include "base/i18n/rtl.h"
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
@@ -154,7 +154,7 @@
const sessions::TabRestoreService::Window& window) {
DCHECK(!window.tabs.empty());
- auto tabs = base::MakeUnique<std::vector<tabs::Tab>>();
+ auto tabs = std::make_unique<std::vector<tabs::Tab>>();
for (const auto& tab : window.tabs)
tabs->push_back(
CreateTabModel(*tab, tab->tabstrip_index == window.selected_tab_index));
@@ -570,7 +570,7 @@
void SessionsEventRouter::TabRestoreServiceChanged(
sessions::TabRestoreService* service) {
std::unique_ptr<base::ListValue> args(new base::ListValue());
- EventRouter::Get(profile_)->BroadcastEvent(base::MakeUnique<Event>(
+ EventRouter::Get(profile_)->BroadcastEvent(std::make_unique<Event>(
events::SESSIONS_ON_CHANGED, api::sessions::OnChanged::kEventName,
std::move(args)));
}
diff --git a/chrome/browser/extensions/api/sessions/sessions_apitest.cc b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
index a0e02b7..6f68a4cd 100644
--- a/chrome/browser/extensions/api/sessions/sessions_apitest.cc
+++ b/chrome/browser/extensions/api/sessions/sessions_apitest.cc
@@ -4,6 +4,7 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/command_line.h"
@@ -195,7 +196,7 @@
browser_sync::ProfileSyncServiceMock* sync_service =
new browser_sync::ProfileSyncServiceMock(
CreateProfileSyncServiceParamsForTest(
- base::MakeUnique<browser_sync::ChromeSyncClient>(profile),
+ std::make_unique<browser_sync::ChromeSyncClient>(profile),
profile));
static_cast<browser_sync::ChromeSyncClient*>(sync_service->GetSyncClient())
->SetSyncApiComponentFactoryForTesting(std::move(factory));
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
index 0a2343bc..dd1e77d7 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
@@ -9,7 +9,6 @@
#include <utility>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/extensions/api/preference/preference_api.h"
#include "chrome/browser/prefs/session_startup_pref.h"
@@ -61,7 +60,7 @@
}
if (!data)
- data = base::MakeUnique<TemplateURLData>();
+ data = std::make_unique<TemplateURLData>();
if (search_provider.name)
data->SetShortName(base::UTF8ToUTF16(*search_provider.name));
@@ -154,15 +153,15 @@
ExtensionPrefs::Get(profile_)->GetInstallParam(extension->id());
if (settings->homepage) {
SetPref(extension->id(), prefs::kHomePage,
- base::MakeUnique<base::Value>(SubstituteInstallParam(
+ std::make_unique<base::Value>(SubstituteInstallParam(
settings->homepage->spec(), install_parameter)));
SetPref(extension->id(), prefs::kHomePageIsNewTabPage,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
}
if (!settings->startup_pages.empty()) {
SetPref(
extension->id(), prefs::kRestoreOnStartup,
- base::MakeUnique<base::Value>(SessionStartupPref::kPrefValueURLs));
+ std::make_unique<base::Value>(SessionStartupPref::kPrefValueURLs));
if (settings->startup_pages.size() > 1) {
VLOG(1) << extensions::ErrorUtils::FormatErrorMessage(
kManyStartupPagesWarning,
@@ -180,7 +179,7 @@
// all search engines.
if (settings->search_engine->is_default) {
SetPref(extension->id(), prefs::kDefaultSearchProviderEnabled,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
} else {
UnsetPref(extension->id(), prefs::kDefaultSearchProviderEnabled);
}
@@ -228,7 +227,7 @@
std::string install_parameter = prefs->GetInstallParam(extension->id());
std::unique_ptr<TemplateURLData> data = ConvertSearchProvider(
profile_->GetPrefs(), *settings->search_engine, install_parameter);
- auto turl = base::MakeUnique<TemplateURL>(
+ auto turl = std::make_unique<TemplateURL>(
*data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, extension->id(),
prefs->GetInstallTime(extension->id()),
settings->search_engine->is_default);
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
index 56d30db..a612b2c 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_browsertest.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <memory>
+
#include "base/macros.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
@@ -30,7 +32,7 @@
// TemplateURLData with search engines settings from test extension manifest.
// chrome/test/data/extensions/settings_override/manifest.json
std::unique_ptr<TemplateURLData> TestExtensionSearchEngine(PrefService* prefs) {
- auto result = base::MakeUnique<TemplateURLData>();
+ auto result = std::make_unique<TemplateURLData>();
result->SetShortName(base::ASCIIToUTF16("name.de"));
result->SetKeyword(base::ASCIIToUTF16("keyword.de"));
result->SetURL("http://www.foo.de/s?q={searchTerms}&id=10");
diff --git a/chrome/browser/extensions/api/settings_private/settings_private_api.cc b/chrome/browser/extensions/api/settings_private/settings_private_api.cc
index 89e9ce0..4898ddb 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_api.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_api.cc
@@ -4,9 +4,9 @@
#include "chrome/browser/extensions/api/settings_private/settings_private_api.h"
+#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/settings_private/settings_private_delegate.h"
#include "chrome/browser/extensions/api/settings_private/settings_private_delegate_factory.h"
@@ -44,10 +44,10 @@
delegate->SetPref(parameters->name, parameters->value.get());
switch (result) {
case settings_private::SetPrefResult::SUCCESS:
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(true)));
case settings_private::SetPrefResult::PREF_NOT_MODIFIABLE:
// Not an error, but return false to indicate setting the pref failed.
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(false)));
case settings_private::SetPrefResult::PREF_NOT_FOUND:
return RespondNow(Error("Pref not found: *", parameters->name));
case settings_private::SetPrefResult::PREF_TYPE_MISMATCH:
@@ -58,7 +58,7 @@
parameters->name));
}
NOTREACHED();
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(false)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(false)));
}
////////////////////////////////////////////////////////////////////////////////
@@ -141,7 +141,7 @@
return RespondNow(Error(kDelegateIsNull));
delegate->SetDefaultZoom(parameters->zoom);
- return RespondNow(OneArgument(base::MakeUnique<base::Value>(true)));
+ return RespondNow(OneArgument(std::make_unique<base::Value>(true)));
}
} // namespace extensions
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 7b9fc05b..adf858f 100644
--- a/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc
+++ b/chrome/browser/extensions/api/settings_private/settings_private_delegate.cc
@@ -6,7 +6,6 @@
#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"
@@ -35,7 +34,7 @@
std::unique_ptr<api::settings_private::PrefObject> pref =
prefs_util_->GetPref(name);
if (!pref)
- return base::MakeUnique<base::Value>();
+ return std::make_unique<base::Value>();
return pref->ToValue();
}
diff --git a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
index 83f7d3a..6f296a9a 100644
--- a/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc
@@ -8,7 +8,6 @@
#include <string>
#include "base/guid.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "components/sync/device_info/device_info.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -32,11 +31,11 @@
TEST(IdMappingHelperTest, SetIdsForDevices) {
std::vector<std::unique_ptr<DeviceInfo>> devices;
- devices.push_back(base::MakeUnique<DeviceInfo>(
+ devices.push_back(std::make_unique<DeviceInfo>(
base::GenerateGUID(), "abc Device", "XYZ v1", "XYZ SyncAgent v1",
sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id1"));
- devices.push_back(base::MakeUnique<DeviceInfo>(
+ devices.push_back(std::make_unique<DeviceInfo>(
base::GenerateGUID(), "def Device", "XYZ v1", "XYZ SyncAgent v1",
sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id2"));
@@ -53,7 +52,7 @@
EXPECT_NE(public_id1, public_id2);
// Now add a third device.
- devices.push_back(base::MakeUnique<DeviceInfo>(
+ devices.push_back(std::make_unique<DeviceInfo>(
base::GenerateGUID(), "ghi Device", "XYZ v1", "XYZ SyncAgent v1",
sync_pb::SyncEnums_DeviceType_TYPE_LINUX, "device_id3"));
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
index 05c9e3b..32d5acde 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/guid.h"
-#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_api_unittest.h"
@@ -45,7 +44,7 @@
static std::unique_ptr<DeviceInfo> CloneDeviceInfo(
const DeviceInfo& device_info) {
- return base::MakeUnique<DeviceInfo>(
+ return std::make_unique<DeviceInfo>(
device_info.guid(), device_info.client_name(),
device_info.chrome_version(), device_info.sync_user_agent(),
device_info.device_type(), device_info.signin_scoped_device_id());
@@ -150,7 +149,7 @@
std::unique_ptr<KeyedService> CreateProfileSyncServiceMock(
content::BrowserContext* context) {
- return base::MakeUnique<ProfileSyncServiceMockForExtensionTests>(
+ return std::make_unique<ProfileSyncServiceMockForExtensionTests>(
Profile::FromBrowserContext(context));
}
diff --git a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
index cbca1fb..75a6bba 100644
--- a/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
+++ b/chrome/browser/extensions/api/signed_in_devices/signed_in_devices_manager.cc
@@ -10,7 +10,6 @@
#include <vector>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/signed_in_devices/signed_in_devices_api.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -75,7 +74,7 @@
std::unique_ptr<base::ListValue> result =
api::signed_in_devices::OnDeviceInfoChange::Create(args);
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::SIGNED_IN_DEVICES_ON_DEVICE_INFO_CHANGE,
api::signed_in_devices::OnDeviceInfoChange::kEventName, std::move(result),
profile_);
@@ -132,7 +131,7 @@
}
}
- change_observers_.push_back(base::MakeUnique<SignedInDevicesChangeObserver>(
+ change_observers_.push_back(std::make_unique<SignedInDevicesChangeObserver>(
details.extension_id, profile_));
}
diff --git a/chrome/browser/extensions/api/socket/combined_socket_unittest.cc b/chrome/browser/extensions/api/socket/combined_socket_unittest.cc
index 14de6494..6feb6fe9 100644
--- a/chrome/browser/extensions/api/socket/combined_socket_unittest.cc
+++ b/chrome/browser/extensions/api/socket/combined_socket_unittest.cc
@@ -4,7 +4,6 @@
#include <memory>
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/api/socket/mock_tcp_client_socket.h"
#include "extensions/browser/api/socket/socket.h"
#include "extensions/browser/api/socket/tcp_socket.h"
@@ -24,14 +23,14 @@
template <>
std::unique_ptr<TCPSocket> CreateTestSocket(
std::unique_ptr<MockTCPClientSocket> stream) {
- return base::MakeUnique<TCPSocket>(std::move(stream), "fake id",
+ return std::make_unique<TCPSocket>(std::move(stream), "fake id",
true /* is_connected */);
}
template <>
std::unique_ptr<TLSSocket> CreateTestSocket(
std::unique_ptr<MockTCPClientSocket> stream) {
- return base::MakeUnique<TLSSocket>(std::move(stream), "fake id");
+ return std::make_unique<TLSSocket>(std::move(stream), "fake id");
}
class CombinedSocketTest : public testing::Test {
diff --git a/chrome/browser/extensions/api/socket/socket_api_unittest.cc b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
index 34e18a1..11ac53e 100644
--- a/chrome/browser/extensions/api/socket/socket_api_unittest.cc
+++ b/chrome/browser/extensions/api/socket/socket_api_unittest.cc
@@ -4,7 +4,6 @@
#include <memory>
-#include "base/memory/ptr_util.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/browser_process_impl.h"
@@ -22,7 +21,7 @@
std::unique_ptr<KeyedService> ApiResourceManagerTestFactory(
content::BrowserContext* context) {
- return base::MakeUnique<ApiResourceManager<Socket>>(context);
+ return std::make_unique<ApiResourceManager<Socket>>(context);
}
class SocketUnitTest : public ExtensionApiUnittest {
diff --git a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
index dbcdc6a2..aa9e1e65 100644
--- a/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
+++ b/chrome/browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc
@@ -4,7 +4,6 @@
#include <memory>
-#include "base/memory/ptr_util.h"
#include "base/threading/sequenced_task_runner_handle.h"
#include "base/values.h"
#include "chrome/browser/browser_process_impl.h"
@@ -24,12 +23,12 @@
static std::unique_ptr<KeyedService> ApiResourceManagerTestFactory(
content::BrowserContext* context) {
- return base::MakeUnique<ApiResourceManager<ResumableTCPSocket>>(context);
+ return std::make_unique<ApiResourceManager<ResumableTCPSocket>>(context);
}
static std::unique_ptr<KeyedService> ApiResourceManagerTestServerFactory(
content::BrowserContext* context) {
- return base::MakeUnique<ApiResourceManager<ResumableTCPServerSocket>>(
+ return std::make_unique<ApiResourceManager<ResumableTCPServerSocket>>(
context);
}
diff --git a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
index 6f9cce6..eb1b11a 100644
--- a/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
+++ b/chrome/browser/extensions/api/storage/policy_value_store_unittest.cc
@@ -10,7 +10,6 @@
#include "base/files/file_path.h"
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "components/policy/core/common/external_data_fetcher.h"
#include "components/policy/core/common/policy_map.h"
@@ -51,7 +50,7 @@
: PolicyValueStore(
kTestExtensionId,
base::MakeRefCounted<SettingsObserverList>(),
- base::MakeUnique<LeveldbValueStore>(kDatabaseUMAClientName, path)) {
+ std::make_unique<LeveldbValueStore>(kDatabaseUMAClientName, path)) {
}
~MutablePolicyValueStore() override {}
@@ -102,7 +101,7 @@
observers_->AddObserver(&observer_);
store_.reset(new PolicyValueStore(
kTestExtensionId, observers_,
- base::MakeUnique<LeveldbValueStore>(kDatabaseUMAClientName,
+ std::make_unique<LeveldbValueStore>(kDatabaseUMAClientName,
scoped_temp_dir_.GetPath())));
}
@@ -141,7 +140,7 @@
expected.CreateDeepCopy(), nullptr);
policies.Set("may", policy::POLICY_LEVEL_RECOMMENDED,
policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD,
- base::MakeUnique<base::Value>(456), nullptr);
+ std::make_unique<base::Value>(456), nullptr);
SetCurrentPolicy(policies);
ValueStore::ReadResult result = store_->Get();
diff --git a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
index bcca9d1..8f135ec3 100644
--- a/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
+++ b/chrome/browser/extensions/api/storage/settings_sync_unittest.cc
@@ -11,7 +11,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_reader.h"
#include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -118,7 +117,7 @@
}
for (syncer::SyncChangeList::const_iterator it = change_list.begin();
it != change_list.end(); ++it) {
- changes_.push_back(base::MakeUnique<SettingSyncData>(*it));
+ changes_.push_back(std::make_unique<SettingSyncData>(*it));
}
return syncer::SyncError();
}
@@ -167,12 +166,12 @@
std::unique_ptr<KeyedService> MockExtensionSystemFactoryFunction(
content::BrowserContext* context) {
- return base::MakeUnique<MockExtensionSystem>(context);
+ return std::make_unique<MockExtensionSystem>(context);
}
std::unique_ptr<KeyedService> BuildEventRouter(
content::BrowserContext* profile) {
- return base::MakeUnique<extensions::EventRouter>(profile, nullptr);
+ return std::make_unique<extensions::EventRouter>(profile, nullptr);
}
} // namespace
@@ -296,7 +295,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
});
AddExtensionAndGetStorage("s2", type);
@@ -342,7 +341,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// Already in sync, so no changes.
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -381,7 +380,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// All settings should have been pushed to sync.
EXPECT_EQ(2u, sync_processor_->changes().size());
@@ -422,7 +421,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
expected1.Set("foo", value1.CreateDeepCopy());
expected2.Set("bar", value2.CreateDeepCopy());
});
@@ -468,7 +467,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
expected2.Set("bar", value2.CreateDeepCopy());
// Make sync add some settings.
@@ -544,7 +543,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// Add something locally.
storage1->Set(DEFAULTS, "bar", value2);
@@ -685,7 +684,7 @@
->MergeDataAndStartSyncing(
syncer::EXTENSION_SETTINGS, sync_data,
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
GetSyncableService(syncer::EXTENSION_SETTINGS)
->StopSyncing(syncer::EXTENSION_SETTINGS);
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -700,7 +699,7 @@
GetSyncableService(syncer::APP_SETTINGS)
->MergeDataAndStartSyncing(
syncer::APP_SETTINGS, sync_data, std::move(app_settings_delegate_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
GetSyncableService(syncer::APP_SETTINGS)->StopSyncing(syncer::APP_SETTINGS);
EXPECT_EQ(0u, sync_processor_->changes().size());
});
@@ -732,7 +731,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
GetExisting("bad")->set_status_code(ValueStore::OK);
@@ -850,7 +849,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// Local settings will have been pushed to sync, since it's empty (in this
// test; presumably it wouldn't be live, since we've been getting changes).
@@ -921,7 +920,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
EXPECT_EQ(0u, sync_processor_->changes().size());
@@ -1026,7 +1025,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1067,7 +1066,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
GetExisting("bad")->set_status_code(ValueStore::OK);
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
@@ -1118,7 +1117,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1161,7 +1160,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
sync_processor_->set_fail_all_requests(false);
// Changes from good will be send to sync, changes from bad won't.
@@ -1205,7 +1204,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1242,7 +1241,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// bad will fail to send changes.
good->Set(DEFAULTS, "foo", fooValue);
@@ -1295,7 +1294,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
EXPECT_EQ(syncer::SyncChange::ACTION_ADD,
sync_processor_->GetOnlyChange("good", "foo")->change_type());
@@ -1334,7 +1333,7 @@
->MergeDataAndStartSyncing(
model_type, syncer::SyncDataList(),
std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
});
// Large local change rejected and doesn't get sent out.
@@ -1386,7 +1385,7 @@
GetSyncableService(model_type)
->MergeDataAndStartSyncing(
model_type, sync_data_list, std::move(sync_processor_wrapper_),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
// Test dots in keys that come from sync.
@@ -1396,7 +1395,7 @@
base::DictionaryValue expected_data;
expected_data.SetWithoutPathExpansion(
- "key.with.dot", base::MakeUnique<base::Value>("value"));
+ "key.with.dot", std::make_unique<base::Value>("value"));
EXPECT_EQ(expected_data, data.settings());
}
diff --git a/chrome/browser/extensions/api/storage/sync_storage_backend.cc b/chrome/browser/extensions/api/storage/sync_storage_backend.cc
index a22c63b..7cb9a4b 100644
--- a/chrome/browser/extensions/api/storage/sync_storage_backend.cc
+++ b/chrome/browser/extensions/api/storage/sync_storage_backend.cc
@@ -29,7 +29,7 @@
}
std::unique_ptr<base::DictionaryValue> EmptyDictionaryValue() {
- return base::MakeUnique<base::DictionaryValue>();
+ return std::make_unique<base::DictionaryValue>();
}
ValueStoreFactory::ModelType ToFactoryModelType(syncer::ModelType sync_type) {
diff --git a/chrome/browser/extensions/api/storage/syncable_settings_storage.cc b/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
index 024631b..3778715 100644
--- a/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
+++ b/chrome/browser/extensions/api/storage/syncable_settings_storage.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/api/storage/settings_sync_processor.h"
#include "chrome/browser/extensions/api/storage/settings_sync_util.h"
@@ -218,13 +217,13 @@
// Sync and local values are the same, no changes to send.
} else {
// Sync value is different, update local setting with new value.
- changes->push_back(base::MakeUnique<SettingSyncData>(
+ changes->push_back(std::make_unique<SettingSyncData>(
syncer::SyncChange::ACTION_UPDATE, extension_id_, it.key(),
std::move(sync_value)));
}
} else {
// Not synced, delete local setting.
- changes->push_back(base::MakeUnique<SettingSyncData>(
+ changes->push_back(std::make_unique<SettingSyncData>(
syncer::SyncChange::ACTION_DELETE, extension_id_, it.key(),
std::unique_ptr<base::Value>(new base::DictionaryValue())));
}
@@ -237,7 +236,7 @@
std::string key = base::DictionaryValue::Iterator(*sync_state).key();
std::unique_ptr<base::Value> value;
CHECK(sync_state->RemoveWithoutPathExpansion(key, &value));
- changes->push_back(base::MakeUnique<SettingSyncData>(
+ changes->push_back(std::make_unique<SettingSyncData>(
syncer::SyncChange::ACTION_ADD, extension_id_, key, std::move(value)));
}
diff --git a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
index 83f5cd6..22ba2ed 100644
--- a/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
+++ b/chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h"
#include "chrome/browser/sync_file_system/sync_event_observer.h"
#include "chrome/browser/sync_file_system/sync_file_system_service.h"
@@ -129,7 +128,7 @@
EventRouter* event_router = EventRouter::Get(browser_context_);
DCHECK(event_router);
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(values), browser_context_);
// No app_origin, broadcast to all listening extensions for this event name.
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index fd33a52..dd19783 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/api/sync_file_system/extension_sync_event_observer.h"
#include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h"
@@ -124,12 +123,12 @@
DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (error != base::File::FILE_OK) {
error_ = ErrorToString(sync_file_system::FileErrorToSyncStatusCode(error));
- SetResult(base::MakeUnique<base::Value>(false));
+ SetResult(std::make_unique<base::Value>(false));
SendResponse(false);
return;
}
- SetResult(base::MakeUnique<base::Value>(true));
+ SetResult(std::make_unique<base::Value>(true));
SendResponse(true);
}
@@ -385,7 +384,7 @@
ExtensionFunction::ResponseAction
SyncFileSystemGetConflictResolutionPolicyFunction::Run() {
return RespondNow(
- OneArgument(base::MakeUnique<base::Value>(api::sync_file_system::ToString(
+ OneArgument(std::make_unique<base::Value>(api::sync_file_system::ToString(
api::sync_file_system::CONFLICT_RESOLUTION_POLICY_LAST_WRITE_WIN))));
}
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
index c191b3d..fa0cac5 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/api/sync_file_system/sync_file_system_api_helpers.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "storage/browser/fileapi/file_system_url.h"
#include "storage/common/fileapi/file_system_util.h"
@@ -124,7 +123,7 @@
root_url.append("/");
}
- auto dict = base::MakeUnique<base::DictionaryValue>();
+ auto dict = std::make_unique<base::DictionaryValue>();
dict->SetString("fileSystemType",
storage::GetFileSystemTypeString(url.mount_type()));
dict->SetString("fileSystemName",
diff --git a/chrome/browser/extensions/api/system_private/system_private_api.cc b/chrome/browser/extensions/api/system_private/system_private_api.cc
index 730d1de..e6f5f4d 100644
--- a/chrome/browser/extensions/api/system_private/system_private_api.cc
+++ b/chrome/browser/extensions/api/system_private/system_private_api.cc
@@ -8,7 +8,6 @@
#include <utility>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
@@ -80,7 +79,7 @@
value >= 0 &&
value < static_cast<int>(arraysize(kIncognitoModeAvailabilityStrings)));
return RespondNow(OneArgument(
- base::MakeUnique<base::Value>(kIncognitoModeAvailabilityStrings[value])));
+ std::make_unique<base::Value>(kIncognitoModeAvailabilityStrings[value])));
}
ExtensionFunction::ResponseAction SystemPrivateGetUpdateStatusFunction::Run() {
@@ -147,7 +146,7 @@
ExtensionFunction::ResponseAction SystemPrivateGetApiKeyFunction::Run() {
return RespondNow(
- OneArgument(base::MakeUnique<base::Value>(google_apis::GetAPIKey())));
+ OneArgument(std::make_unique<base::Value>(google_apis::GetAPIKey())));
}
void DispatchVolumeChangedEvent(double volume, bool is_volume_muted) {
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index 5df6422..6cd5062 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -4,11 +4,11 @@
#include "chrome/browser/extensions/api/tab_capture/tab_capture_registry.h"
+#include <memory>
#include <utility>
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/sessions/session_tab_helper.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
@@ -314,7 +314,7 @@
}
}
- requests_.push_back(base::MakeUnique<LiveRequest>(
+ requests_.push_back(std::make_unique<LiveRequest>(
target_contents, extension_id, is_anonymous, this));
return true;
}
@@ -427,7 +427,7 @@
tab_capture::CaptureInfo info;
request->GetCaptureInfo(&info);
args->Append(info.ToValue());
- auto event = base::MakeUnique<Event>(events::TAB_CAPTURE_ON_STATUS_CHANGED,
+ auto event = std::make_unique<Event>(events::TAB_CAPTURE_ON_STATUS_CHANGED,
tab_capture::OnStatusChanged::kEventName,
std::move(args), browser_context_);
diff --git a/chrome/browser/extensions/api/tabs/app_window_controller.cc b/chrome/browser/extensions/api/tabs/app_window_controller.cc
index bc8272b..3d0bd3e 100644
--- a/chrome/browser/extensions/api/tabs/app_window_controller.cc
+++ b/chrome/browser/extensions/api/tabs/app_window_controller.cc
@@ -7,7 +7,6 @@
#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/tabs/app_base_window.h"
@@ -57,7 +56,7 @@
if (!tab_value)
return result;
- auto tab_list = base::MakeUnique<base::ListValue>();
+ auto tab_list = std::make_unique<base::ListValue>();
tab_list->Append(std::move(tab_value));
result->Set(tabs_constants::kTabsKey, std::move(tab_list));
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc
index 8e9a546..e802ba00 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_api.cc
@@ -15,7 +15,6 @@
#include "base/command_line.h"
#include "base/location.h"
#include "base/logging.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"
@@ -657,7 +656,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::MakeUnique<base::Value>();
+ result = std::make_unique<base::Value>();
} else {
result = controller->CreateWindowValueWithTabs(extension());
}
@@ -1744,7 +1743,7 @@
return;
}
- SetResult(base::MakeUnique<base::Value>(base64_result));
+ SetResult(std::make_unique<base::Value>(base64_result));
SendResponse(true);
}
@@ -1854,7 +1853,7 @@
}
void TabsDetectLanguageFunction::GotLanguage(const std::string& language) {
- SetResult(base::MakeUnique<base::Value>(language));
+ SetResult(std::make_unique<base::Value>(language));
SendResponse(true);
Release(); // Balanced in Run()
diff --git a/chrome/browser/extensions/api/tabs/tabs_event_router.cc b/chrome/browser/extensions/api/tabs/tabs_event_router.cc
index d9d9889..1ab063b 100644
--- a/chrome/browser/extensions/api/tabs/tabs_event_router.cc
+++ b/chrome/browser/extensions/api/tabs/tabs_event_router.cc
@@ -9,7 +9,6 @@
#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/tabs/tabs_constants.h"
@@ -50,12 +49,12 @@
std::unique_ptr<base::DictionaryValue> tab_value = tab_object->ToValue();
- auto changed_properties = base::MakeUnique<base::DictionaryValue>();
+ auto changed_properties = std::make_unique<base::DictionaryValue>();
const base::Value* value = nullptr;
for (const auto& property : changed_property_names) {
if (tab_value->Get(property, &value))
changed_properties->Set(property,
- base::MakeUnique<base::Value>(value->Clone()));
+ std::make_unique<base::Value>(value->Clone()));
}
event->event_args->Set(1, std::move(changed_properties));
@@ -160,7 +159,7 @@
int tab_id = ExtensionTabUtil::GetTabId(contents);
DCHECK(tab_entries_.find(tab_id) == tab_entries_.end());
- tab_entries_[tab_id] = base::MakeUnique<TabEntry>(this, contents);
+ tab_entries_[tab_id] = std::make_unique<TabEntry>(this, contents);
}
void TabsEventRouter::UnregisterForTabNotifications(WebContents* contents) {
@@ -203,7 +202,7 @@
bool active) {
Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
std::unique_ptr<base::ListValue> args(new base::ListValue);
- auto event = base::MakeUnique<Event>(events::TABS_ON_CREATED,
+ auto event = std::make_unique<Event>(events::TABS_ON_CREATED,
tabs::OnCreated::kEventName,
std::move(args), profile);
event->user_gesture = EventRouter::USER_GESTURE_NOT_ENABLED;
@@ -236,9 +235,9 @@
new base::DictionaryValue());
object_args->Set(
tabs_constants::kNewWindowIdKey,
- base::MakeUnique<Value>(ExtensionTabUtil::GetWindowIdOfTab(contents)));
+ std::make_unique<Value>(ExtensionTabUtil::GetWindowIdOfTab(contents)));
object_args->Set(tabs_constants::kNewPositionKey,
- base::MakeUnique<Value>(index));
+ std::make_unique<Value>(index));
args->Append(std::move(object_args));
Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
@@ -259,9 +258,9 @@
new base::DictionaryValue());
object_args->Set(
tabs_constants::kOldWindowIdKey,
- base::MakeUnique<Value>(ExtensionTabUtil::GetWindowIdOfTab(contents)));
+ std::make_unique<Value>(ExtensionTabUtil::GetWindowIdOfTab(contents)));
object_args->Set(tabs_constants::kOldPositionKey,
- base::MakeUnique<Value>(index));
+ std::make_unique<Value>(index));
args->Append(std::move(object_args));
Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
@@ -296,13 +295,13 @@
WebContents* new_contents,
int index,
int reason) {
- auto args = base::MakeUnique<base::ListValue>();
+ auto args = std::make_unique<base::ListValue>();
int tab_id = ExtensionTabUtil::GetTabId(new_contents);
args->AppendInteger(tab_id);
- auto object_args = base::MakeUnique<base::DictionaryValue>();
+ auto object_args = std::make_unique<base::DictionaryValue>();
object_args->Set(tabs_constants::kWindowIdKey,
- base::MakeUnique<Value>(
+ std::make_unique<Value>(
ExtensionTabUtil::GetWindowIdOfTab(new_contents)));
args->Append(object_args->CreateDeepCopy());
@@ -321,8 +320,8 @@
tabs::OnActiveChanged::kEventName, std::move(args), gesture);
// The onActivated event takes one argument: {windowId, tabId}.
- auto on_activated_args = base::MakeUnique<base::ListValue>();
- object_args->Set(tabs_constants::kTabIdKey, base::MakeUnique<Value>(tab_id));
+ auto on_activated_args = std::make_unique<base::ListValue>();
+ object_args->Set(tabs_constants::kTabIdKey, std::make_unique<Value>(tab_id));
on_activated_args->Append(std::move(object_args));
DispatchEvent(profile, events::TABS_ON_ACTIVATED,
tabs::OnActivated::kEventName, std::move(on_activated_args),
@@ -350,7 +349,7 @@
select_info->Set(
tabs_constants::kWindowIdKey,
- base::MakeUnique<Value>(
+ std::make_unique<Value>(
ExtensionTabUtil::GetWindowIdOfTabStripModel(tab_strip_model)));
select_info->Set(tabs_constants::kTabIdsKey, std::move(all_tabs));
@@ -377,11 +376,11 @@
new base::DictionaryValue());
object_args->Set(
tabs_constants::kWindowIdKey,
- base::MakeUnique<Value>(ExtensionTabUtil::GetWindowIdOfTab(contents)));
+ std::make_unique<Value>(ExtensionTabUtil::GetWindowIdOfTab(contents)));
object_args->Set(tabs_constants::kFromIndexKey,
- base::MakeUnique<Value>(from_index));
+ std::make_unique<Value>(from_index));
object_args->Set(tabs_constants::kToIndexKey,
- base::MakeUnique<Value>(to_index));
+ std::make_unique<Value>(to_index));
args->Append(std::move(object_args));
Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
@@ -426,7 +425,7 @@
if (!profile_->IsSameProfile(profile) || !event_router)
return;
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(args), profile);
event->user_gesture = user_gesture;
event_router->BroadcastEvent(std::move(event));
@@ -453,7 +452,7 @@
// WillDispatchTabUpdatedEvent.
Profile* profile = Profile::FromBrowserContext(contents->GetBrowserContext());
- auto event = base::MakeUnique<Event>(events::TABS_ON_UPDATED,
+ auto event = std::make_unique<Event>(events::TABS_ON_UPDATED,
tabs::OnUpdated::kEventName,
std::move(args_base), profile);
event->user_gesture = EventRouter::USER_GESTURE_NOT_ENABLED;
diff --git a/chrome/browser/extensions/api/tabs/windows_event_router.cc b/chrome/browser/extensions/api/tabs/windows_event_router.cc
index e24c1c6..0ef3e6f9 100644
--- a/chrome/browser/extensions/api/tabs/windows_event_router.cc
+++ b/chrome/browser/extensions/api/tabs/windows_event_router.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -254,9 +253,9 @@
if (!HasEventListener(windows::OnFocusChanged::kEventName))
return;
- std::unique_ptr<Event> event = base::MakeUnique<Event>(
+ std::unique_ptr<Event> event = std::make_unique<Event>(
events::WINDOWS_ON_FOCUS_CHANGED, windows::OnFocusChanged::kEventName,
- base::MakeUnique<base::ListValue>());
+ std::make_unique<base::ListValue>());
event->will_dispatch_callback =
base::Bind(&WillDispatchWindowFocusedEvent, window_controller);
EventRouter::Get(profile_)->BroadcastEvent(std::move(event));
@@ -267,7 +266,7 @@
WindowController* window_controller,
std::unique_ptr<base::ListValue> args) {
auto event =
- base::MakeUnique<Event>(histogram_value, event_name, std::move(args),
+ std::make_unique<Event>(histogram_value, event_name, std::move(args),
window_controller->profile());
event->will_dispatch_callback =
base::Bind(&WillDispatchWindowEvent, window_controller);
@@ -280,7 +279,7 @@
void WindowsEventRouter::AddAppWindow(extensions::AppWindow* app_window) {
std::unique_ptr<AppWindowController> controller(new AppWindowController(
- app_window, base::MakeUnique<AppBaseWindow>(app_window), profile_));
+ app_window, std::make_unique<AppBaseWindow>(app_window), profile_));
app_windows_[app_window->session_id().id()] = std::move(controller);
}
diff --git a/chrome/browser/extensions/api/terminal/terminal_private_api.cc b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
index 582571ef..ee44ebf 100644
--- a/chrome/browser/extensions/api/terminal/terminal_private_api.cc
+++ b/chrome/browser/extensions/api/terminal/terminal_private_api.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/extensions/api/terminal/terminal_private_api.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/command_line.h"
#include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
#include "base/sys_info.h"
#include "base/task_scheduler/post_task.h"
#include "base/values.h"
@@ -177,7 +177,7 @@
Respond(Error("Failed to open process."));
return;
}
- Respond(OneArgument(base::MakeUnique<base::Value>(terminal_id)));
+ Respond(OneArgument(std::make_unique<base::Value>(terminal_id)));
}
ExtensionFunction::ResponseAction TerminalPrivateSendInputFunction::Run() {
@@ -206,7 +206,7 @@
}
void TerminalPrivateSendInputFunction::RespondOnUIThread(bool success) {
- Respond(OneArgument(base::MakeUnique<base::Value>(success)));
+ Respond(OneArgument(std::make_unique<base::Value>(success)));
}
TerminalPrivateCloseTerminalProcessFunction::
@@ -241,7 +241,7 @@
void TerminalPrivateCloseTerminalProcessFunction::RespondOnUIThread(
bool success) {
- Respond(OneArgument(base::MakeUnique<base::Value>(success)));
+ Respond(OneArgument(std::make_unique<base::Value>(success)));
}
TerminalPrivateOnTerminalResizeFunction::
@@ -278,7 +278,7 @@
}
void TerminalPrivateOnTerminalResizeFunction::RespondOnUIThread(bool success) {
- Respond(OneArgument(base::MakeUnique<base::Value>(success)));
+ Respond(OneArgument(std::make_unique<base::Value>(success)));
}
TerminalPrivateAckOutputFunction::~TerminalPrivateAckOutputFunction() {}
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 e49ad90f..c52172b 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api.cc
@@ -6,8 +6,9 @@
#include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h"
+#include <memory>
+
#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"
@@ -479,7 +480,7 @@
include_incognito(), nullptr, nullptr,
&web_contents, nullptr) ||
!web_contents) {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
+ return RespondNow(OneArgument(std::make_unique<base::Value>()));
}
WebNavigationTabObserver* observer =
@@ -493,11 +494,11 @@
ExtensionApiFrameIdMap::Get()->GetRenderFrameHostById(web_contents,
frame_id);
if (!frame_navigation_state.IsValidFrame(render_frame_host))
- return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
+ return RespondNow(OneArgument(std::make_unique<base::Value>()));
GURL frame_url = frame_navigation_state.GetUrl(render_frame_host);
if (!frame_navigation_state.IsValidUrl(frame_url))
- return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
+ return RespondNow(OneArgument(std::make_unique<base::Value>()));
GetFrame::Results::Details frame_details;
frame_details.url = frame_url.spec();
@@ -519,7 +520,7 @@
include_incognito(), nullptr, nullptr,
&web_contents, nullptr) ||
!web_contents) {
- return RespondNow(OneArgument(base::MakeUnique<base::Value>()));
+ return RespondNow(OneArgument(std::make_unique<base::Value>()));
}
WebNavigationTabObserver* observer =
diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
index 42d255fb..b625184 100644
--- a/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_api_helpers.cc
@@ -10,7 +10,6 @@
#include <utility>
#include "base/json/json_writer.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
@@ -78,7 +77,7 @@
ExtensionApiFrameIdMap::GetParentFrameId(navigation_handle);
details.time_stamp = MilliSecondsFromTime(base::Time::Now());
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::WEB_NAVIGATION_ON_BEFORE_NAVIGATE,
web_navigation::OnBeforeNavigate::kEventName,
web_navigation::OnBeforeNavigate::Create(details),
@@ -123,7 +122,7 @@
ui::PAGE_TRANSITION_AUTO_TOPLEVEL))
transition_type_string = "start_page";
dict->SetString(keys::kTransitionTypeKey, transition_type_string);
- auto qualifiers = base::MakeUnique<base::ListValue>();
+ auto qualifiers = std::make_unique<base::ListValue>();
if (transition_type & ui::PAGE_TRANSITION_CLIENT_REDIRECT)
qualifiers->AppendString("client_redirect");
if (transition_type & ui::PAGE_TRANSITION_SERVER_REDIRECT)
@@ -138,7 +137,7 @@
content::BrowserContext* browser_context =
navigation_handle->GetWebContents()->GetBrowserContext();
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(args), browser_context);
DispatchEvent(browser_context, std::move(event), url);
}
@@ -155,7 +154,7 @@
details.time_stamp = MilliSecondsFromTime(base::Time::Now());
content::BrowserContext* browser_context = web_contents->GetBrowserContext();
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::WEB_NAVIGATION_ON_DOM_CONTENT_LOADED,
web_navigation::OnDOMContentLoaded::kEventName,
web_navigation::OnDOMContentLoaded::Create(details), browser_context);
@@ -174,7 +173,7 @@
details.time_stamp = MilliSecondsFromTime(base::Time::Now());
content::BrowserContext* browser_context = web_contents->GetBrowserContext();
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::WEB_NAVIGATION_ON_COMPLETED,
web_navigation::OnCompleted::kEventName,
web_navigation::OnCompleted::Create(details), browser_context);
@@ -204,7 +203,7 @@
details.tab_id = ExtensionTabUtil::GetTabId(target_web_contents);
details.time_stamp = MilliSecondsFromTime(base::Time::Now());
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::WEB_NAVIGATION_ON_CREATED_NAVIGATION_TARGET,
web_navigation::OnCreatedNavigationTarget::kEventName,
web_navigation::OnCreatedNavigationTarget::Create(details),
@@ -233,7 +232,7 @@
content::BrowserContext* browser_context = web_contents->GetBrowserContext();
auto event =
- base::MakeUnique<Event>(events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
+ std::make_unique<Event>(events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
web_navigation::OnErrorOccurred::kEventName,
web_navigation::OnErrorOccurred::Create(details),
web_contents->GetBrowserContext());
@@ -254,7 +253,7 @@
content::BrowserContext* browser_context =
navigation_handle->GetWebContents()->GetBrowserContext();
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::WEB_NAVIGATION_ON_ERROR_OCCURRED,
web_navigation::OnErrorOccurred::kEventName,
web_navigation::OnErrorOccurred::Create(details), browser_context);
@@ -271,7 +270,7 @@
details.tab_id = ExtensionTabUtil::GetTabId(new_web_contents);
details.time_stamp = MilliSecondsFromTime(base::Time::Now());
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
events::WEB_NAVIGATION_ON_TAB_REPLACED,
web_navigation::OnTabReplaced::kEventName,
web_navigation::OnTabReplaced::Create(details), browser_context);
diff --git a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
index 6fc5872..dd86f9b 100644
--- a/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
@@ -557,14 +557,14 @@
true /* overwrite */);
}
std::vector<std::unique_ptr<net::UploadElementReader>> element_readers;
- element_readers.push_back(base::MakeUnique<net::UploadBytesElementReader>(
+ element_readers.push_back(std::make_unique<net::UploadBytesElementReader>(
&(bytes_1[0]), bytes_1.size()));
- element_readers.push_back(base::MakeUnique<net::UploadFileElementReader>(
+ element_readers.push_back(std::make_unique<net::UploadFileElementReader>(
base::ThreadTaskRunnerHandle::Get().get(), base::FilePath(), 0, 0,
base::Time()));
- element_readers.push_back(base::MakeUnique<net::UploadBytesElementReader>(
+ element_readers.push_back(std::make_unique<net::UploadBytesElementReader>(
&(bytes_2[0]), bytes_2.size()));
- request->set_upload(base::MakeUnique<net::ElementsUploadDataStream>(
+ request->set_upload(std::make_unique<net::ElementsUploadDataStream>(
std::move(element_readers), 0));
ipc_sender_.PushTask(base::Bind(&base::DoNothing));
request->Start();
@@ -636,7 +636,7 @@
Value::CreateWithCopiedBuffer(kPlainBlock1, kPlainBlock1Length), &raw);
extensions::subtle::AppendKeyValuePair(
keys::kRequestBodyRawFileKey,
- base::MakeUnique<base::Value>(std::string()), &raw);
+ std::make_unique<base::Value>(std::string()), &raw);
extensions::subtle::AppendKeyValuePair(
keys::kRequestBodyRawBytesKey,
Value::CreateWithCopiedBuffer(kPlainBlock2, kPlainBlock2Length), &raw);
diff --git a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
index c0a1ce1..fa1e2bd 100644
--- a/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
+++ b/chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_api.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/lazy_instance.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/task_runner_util.h"
@@ -93,9 +92,9 @@
const std::string& extension_id = extension->id();
if (router->ExtensionHasEventListener(extension_id, kEventName) &&
extension->permissions_data()->HasAPIPermission("webrtcAudioPrivate")) {
- std::unique_ptr<Event> event = base::MakeUnique<Event>(
+ std::unique_ptr<Event> event = std::make_unique<Event>(
events::WEBRTC_AUDIO_PRIVATE_ON_SINKS_CHANGED, kEventName,
- base::MakeUnique<base::ListValue>());
+ std::make_unique<base::ListValue>());
router->DispatchEventToExtension(extension_id, std::move(event));
}
}
@@ -198,7 +197,7 @@
ReceiveOutputDeviceDescriptionsOnIOThread(
media::AudioDeviceDescriptions sink_devices) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
- auto results = base::MakeUnique<SinkInfoVector>();
+ auto results = std::make_unique<SinkInfoVector>();
for (const media::AudioDeviceDescription& description : sink_devices) {
wap::SinkInfo info;
info.sink_id = CalculateHMAC(description.unique_id);
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
index b04347d..254f5091 100644
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -655,7 +654,7 @@
ExtensionFunction::ResponseValue
WebstorePrivateIsPendingCustodianApprovalFunction::BuildResponse(bool result) {
- return OneArgument(base::MakeUnique<base::Value>(result));
+ return OneArgument(std::make_unique<base::Value>(result));
}
} // namespace extensions
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index 42e6ee53..68f92bf 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -12,7 +12,6 @@
#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "build/build_config.h"
@@ -420,7 +419,7 @@
return;
gfx::ImageSkia icon_image(
- base::MakeUnique<GeneratedIconImageSource>(letter, color, output_size),
+ std::make_unique<GeneratedIconImageSource>(letter, color, output_size),
gfx::Size(output_size, output_size));
SkBitmap& dst = (*bitmaps)[output_size].bitmap;
if (dst.tryAllocPixels(icon_image.bitmap()->info())) {
diff --git a/chrome/browser/extensions/bookmark_app_helper_browsertest.cc b/chrome/browser/extensions/bookmark_app_helper_browsertest.cc
index ed2e067..e9f1339 100644
--- a/chrome/browser/extensions/bookmark_app_helper_browsertest.cc
+++ b/chrome/browser/extensions/bookmark_app_helper_browsertest.cc
@@ -73,7 +73,7 @@
if (info.title.empty())
info.title = base::UTF8ToUTF16(info.app_url.spec());
- bookmark_app_helper_ = base::MakeUnique<TestBookmarkAppHelper>(
+ bookmark_app_helper_ = std::make_unique<TestBookmarkAppHelper>(
browser()->profile(), info, web_contents(), quit_closure_,
WebAppInstallSource::MENU);
bookmark_app_helper_->Create(
diff --git a/chrome/browser/extensions/bookmark_app_navigation_throttle_browsertest.cc b/chrome/browser/extensions/bookmark_app_navigation_throttle_browsertest.cc
index 9340e1eb..acee360 100644
--- a/chrome/browser/extensions/bookmark_app_navigation_throttle_browsertest.cc
+++ b/chrome/browser/extensions/bookmark_app_navigation_throttle_browsertest.cc
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/histogram_tester.h"
#include "base/test/scoped_feature_list.h"
@@ -298,7 +297,7 @@
class BookmarkAppNavigationThrottleBrowserTest : public ExtensionBrowserTest {
public:
void SetUp() override {
- scoped_feature_list_ = base::MakeUnique<base::test::ScopedFeatureList>();
+ scoped_feature_list_ = std::make_unique<base::test::ScopedFeatureList>();
scoped_feature_list_->InitAndEnableFeature(features::kDesktopPWAWindowing);
// Register a request handler that will return empty pages. Tests are
@@ -310,7 +309,7 @@
request.GetURL().path() == "/client-redirect") {
return std::unique_ptr<HttpResponse>();
}
- auto response = base::MakeUnique<BasicHttpResponse>();
+ auto response = std::make_unique<BasicHttpResponse>();
response->set_content_type("text/html");
response->AddCustomHeader("Access-Control-Allow-Origin", "*");
return static_cast<std::unique_ptr<HttpResponse>>(
diff --git a/chrome/browser/extensions/chrome_app_icon.cc b/chrome/browser/extensions/chrome_app_icon.cc
index 28bc3f9..a932ece2 100644
--- a/chrome/browser/extensions/chrome_app_icon.cc
+++ b/chrome/browser/extensions/chrome_app_icon.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/chrome_app_icon_delegate.h"
#include "chrome/browser/extensions/extension_util.h"
#include "extensions/browser/extension_registry.h"
@@ -93,7 +92,7 @@
const gfx::ImageSkia default_icon = extension && extension->is_app()
? util::GetDefaultAppIcon()
: util::GetDefaultExtensionIcon();
- icon_ = base::MakeUnique<IconImage>(
+ icon_ = std::make_unique<IconImage>(
browser_context_, extension,
extension ? IconsInfo::GetIcons(extension) : ExtensionIconSet(),
resource_size_in_dip_, default_icon, this);
@@ -122,7 +121,7 @@
const Extension* extension = GetExtension();
if (extension && extension->from_bookmark()) {
image_skia_ =
- gfx::ImageSkia(base::MakeUnique<RoundedCornersImageSource>(image_skia_),
+ gfx::ImageSkia(std::make_unique<RoundedCornersImageSource>(image_skia_),
image_skia_.size());
}
diff --git a/chrome/browser/extensions/chrome_app_icon_service.cc b/chrome/browser/extensions/chrome_app_icon_service.cc
index 309cd91..0173a878 100644
--- a/chrome/browser/extensions/chrome_app_icon_service.cc
+++ b/chrome/browser/extensions/chrome_app_icon_service.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/chrome_app_icon_service.h"
#include "base/bind.h"
-#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/extensions/chrome_app_icon.h"
#include "chrome/browser/extensions/chrome_app_icon_service_factory.h"
@@ -23,7 +22,7 @@
ChromeAppIconService::ChromeAppIconService(content::BrowserContext* context)
: context_(context), observer_(this), weak_ptr_factory_(this) {
#if defined(OS_CHROMEOS)
- app_updater_ = base::MakeUnique<LauncherExtensionAppUpdater>(this, context);
+ app_updater_ = std::make_unique<LauncherExtensionAppUpdater>(this, context);
#endif
observer_.Add(ExtensionRegistry::Get(context_));
@@ -41,7 +40,7 @@
ChromeAppIconDelegate* delegate,
const std::string& app_id,
int resource_size_in_dip) {
- std::unique_ptr<ChromeAppIcon> icon = base::MakeUnique<ChromeAppIcon>(
+ std::unique_ptr<ChromeAppIcon> icon = std::make_unique<ChromeAppIcon>(
delegate, context_,
base::Bind(&ChromeAppIconService::OnIconDestroyed,
weak_ptr_factory_.GetWeakPtr()),
diff --git a/chrome/browser/extensions/chrome_app_sorting.cc b/chrome/browser/extensions/chrome_app_sorting.cc
index b25ae4b..d3cc43c1 100644
--- a/chrome/browser/extensions/chrome_app_sorting.cc
+++ b/chrome/browser/extensions/chrome_app_sorting.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/chrome_app_sorting.h"
#include <algorithm>
+#include <memory>
#include <utility>
#include <vector>
@@ -325,7 +326,7 @@
std::unique_ptr<base::Value> new_value =
new_app_launch_ordinal.IsValid()
- ? base::MakeUnique<base::Value>(
+ ? std::make_unique<base::Value>(
new_app_launch_ordinal.ToInternalValue())
: nullptr;
@@ -405,7 +406,7 @@
std::unique_ptr<base::Value> new_value =
new_page_ordinal.IsValid()
- ? base::MakeUnique<base::Value>(new_page_ordinal.ToInternalValue())
+ ? std::make_unique<base::Value>(new_page_ordinal.ToInternalValue())
: nullptr;
ExtensionPrefs::Get(browser_context_)
diff --git a/chrome/browser/extensions/chrome_app_sorting_unittest.cc b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
index 753642e..3f561ff 100644
--- a/chrome/browser/extensions/chrome_app_sorting_unittest.cc
+++ b/chrome/browser/extensions/chrome_app_sorting_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/chrome_app_sorting.h"
+#include <memory>
+
#include "chrome/browser/extensions/extension_prefs_unittest.h"
#include "components/crx_file/id_util.h"
#include "components/sync/model/string_ordinal.h"
@@ -154,24 +156,24 @@
static_cast<ExtensionScopedPrefs*>(prefs());
scoped_prefs->UpdateExtensionPref(extension1()->id(),
kPrefAppLaunchIndexDeprecated,
- base::MakeUnique<base::Value>(0));
+ std::make_unique<base::Value>(0));
scoped_prefs->UpdateExtensionPref(extension1()->id(),
kPrefPageIndexDeprecated,
- base::MakeUnique<base::Value>(0));
+ std::make_unique<base::Value>(0));
scoped_prefs->UpdateExtensionPref(extension2()->id(),
kPrefAppLaunchIndexDeprecated,
- base::MakeUnique<base::Value>(1));
+ std::make_unique<base::Value>(1));
scoped_prefs->UpdateExtensionPref(extension2()->id(),
kPrefPageIndexDeprecated,
- base::MakeUnique<base::Value>(0));
+ std::make_unique<base::Value>(0));
scoped_prefs->UpdateExtensionPref(extension3()->id(),
kPrefAppLaunchIndexDeprecated,
- base::MakeUnique<base::Value>(0));
+ std::make_unique<base::Value>(0));
scoped_prefs->UpdateExtensionPref(extension3()->id(),
kPrefPageIndexDeprecated,
- base::MakeUnique<base::Value>(1));
+ std::make_unique<base::Value>(1));
// We insert the ids in reverse order so that we have to deal with the
// element on the 2nd page before the 1st page is seen.
@@ -261,10 +263,10 @@
static_cast<ExtensionScopedPrefs*>(prefs());
scoped_prefs->UpdateExtensionPref(extension1()->id(),
kPrefAppLaunchIndexDeprecated,
- base::MakeUnique<base::Value>(0));
+ std::make_unique<base::Value>(0));
scoped_prefs->UpdateExtensionPref(extension1()->id(),
kPrefPageIndexDeprecated,
- base::MakeUnique<base::Value>(-1));
+ std::make_unique<base::Value>(-1));
}
void Verify() override {
// Make sure that the invalid page_index wasn't converted over.
diff --git a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
index 3b56790..d4ab696 100644
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
@@ -6,12 +6,12 @@
#include <stddef.h>
+#include <memory>
#include <set>
#include "base/command_line.h"
#include "base/debug/alias.h"
#include "base/debug/dump_without_crashing.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/threading/sequenced_worker_pool.h"
#include "chrome/browser/browser_process.h"
@@ -918,10 +918,10 @@
std::vector<std::unique_ptr<storage::FileSystemBackend>>*
additional_backends) {
additional_backends->push_back(
- base::MakeUnique<MediaFileSystemBackend>(storage_partition_path));
+ std::make_unique<MediaFileSystemBackend>(storage_partition_path));
additional_backends->push_back(
- base::MakeUnique<sync_file_system::SyncFileSystemBackend>(
+ std::make_unique<sync_file_system::SyncFileSystemBackend>(
Profile::FromBrowserContext(browser_context)));
}
diff --git a/chrome/browser/extensions/chrome_content_verifier_delegate.cc b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
index 7b18151..c7fbd331 100644
--- a/chrome/browser/extensions/chrome_content_verifier_delegate.cc
+++ b/chrome/browser/extensions/chrome_content_verifier_delegate.cc
@@ -11,7 +11,6 @@
#include "base/base_switches.h"
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_piece.h"
@@ -114,7 +113,7 @@
: context_(context),
default_mode_(GetDefaultMode()),
policy_extension_reinstaller_(
- base::MakeUnique<PolicyExtensionReinstaller>(context_)) {}
+ std::make_unique<PolicyExtensionReinstaller>(context_)) {}
ChromeContentVerifierDelegate::~ChromeContentVerifierDelegate() {
}
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
index 10ee4d7a..4c02711 100644
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "base/version.h"
#include "build/build_config.h"
#include "chrome/browser/app_mode/app_mode_utils.h"
@@ -332,7 +331,7 @@
if (!extension_cache_.get()) {
#if defined(OS_CHROMEOS)
extension_cache_.reset(new ExtensionCacheImpl(
- base::MakeUnique<ChromeOSExtensionCacheDelegate>()));
+ std::make_unique<ChromeOSExtensionCacheDelegate>()));
#else
extension_cache_.reset(new NullExtensionCache());
#endif
@@ -423,14 +422,14 @@
std::unique_ptr<ExtensionApiFrameIdMapHelper>
ChromeExtensionsBrowserClient::CreateExtensionApiFrameIdMapHelper(
ExtensionApiFrameIdMap* map) {
- return base::MakeUnique<ChromeExtensionApiFrameIdMapHelper>(map);
+ return std::make_unique<ChromeExtensionApiFrameIdMapHelper>(map);
}
std::unique_ptr<content::BluetoothChooser>
ChromeExtensionsBrowserClient::CreateBluetoothChooser(
content::RenderFrameHost* frame,
const content::BluetoothChooser::EventHandler& event_handler) {
- return base::MakeUnique<ChromeExtensionBluetoothChooser>(frame,
+ return std::make_unique<ChromeExtensionBluetoothChooser>(frame,
event_handler);
}
diff --git a/chrome/browser/extensions/content_verifier_browsertest.cc b/chrome/browser/extensions/content_verifier_browsertest.cc
index c0e76a2..1377c43 100644
--- a/chrome/browser/extensions/content_verifier_browsertest.cc
+++ b/chrome/browser/extensions/content_verifier_browsertest.cc
@@ -3,13 +3,13 @@
// found in the LICENSE file.
#include <list>
+#include <memory>
#include <set>
#include <string>
#include "base/bind_helpers.h"
#include "base/callback_helpers.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/scoped_observer.h"
#include "base/strings/string_split.h"
@@ -644,7 +644,7 @@
system->management_policy()->RegisterProvider(&policy);
ExtensionDownloader::set_test_delegate(&downloader);
service->AddProviderForTesting(
- base::MakeUnique<TestExternalProvider>(service, id));
+ std::make_unique<TestExternalProvider>(service, id));
base::FilePath crx_path =
test_data_dir_.AppendASCII("content_verifier/v1.crx");
diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc
index 4ecbe01..45cf430 100644
--- a/chrome/browser/extensions/convert_user_script.cc
+++ b/chrome/browser/extensions/convert_user_script.cc
@@ -16,7 +16,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
@@ -106,12 +105,12 @@
root->SetString(keys::kPublicKey, key);
root->SetBoolean(keys::kConvertedFromUserScript, true);
- auto js_files = base::MakeUnique<base::ListValue>();
+ auto js_files = std::make_unique<base::ListValue>();
js_files->AppendString("script.js");
// If the script provides its own match patterns, we use those. Otherwise, we
// generate some using the include globs.
- auto matches = base::MakeUnique<base::ListValue>();
+ auto matches = std::make_unique<base::ListValue>();
if (!script.url_patterns().is_empty()) {
for (URLPatternSet::const_iterator i = script.url_patterns().begin();
i != script.url_patterns().end(); ++i) {
@@ -124,7 +123,7 @@
}
// Read the exclude matches, if any are present.
- auto exclude_matches = base::MakeUnique<base::ListValue>();
+ auto exclude_matches = std::make_unique<base::ListValue>();
if (!script.exclude_url_patterns().is_empty()) {
for (URLPatternSet::const_iterator i =
script.exclude_url_patterns().begin();
@@ -133,15 +132,15 @@
}
}
- auto includes = base::MakeUnique<base::ListValue>();
+ auto includes = std::make_unique<base::ListValue>();
for (size_t i = 0; i < script.globs().size(); ++i)
includes->AppendString(script.globs().at(i));
- auto excludes = base::MakeUnique<base::ListValue>();
+ auto excludes = std::make_unique<base::ListValue>();
for (size_t i = 0; i < script.exclude_globs().size(); ++i)
excludes->AppendString(script.exclude_globs().at(i));
- auto content_script = base::MakeUnique<base::DictionaryValue>();
+ auto content_script = std::make_unique<base::DictionaryValue>();
content_script->Set(keys::kMatches, std::move(matches));
content_script->Set(keys::kExcludeMatches, std::move(exclude_matches));
content_script->Set(keys::kIncludeGlobs, std::move(includes));
@@ -156,7 +155,7 @@
// This is the default, but store it just in case we change that.
content_script->SetString(keys::kRunAt, values::kRunAtDocumentIdle);
- auto content_scripts = base::MakeUnique<base::ListValue>();
+ auto content_scripts = std::make_unique<base::ListValue>();
content_scripts->Append(std::move(content_script));
root->Set(keys::kContentScripts, std::move(content_scripts));
diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc
index db5c4bca..8b91eb3 100644
--- a/chrome/browser/extensions/convert_web_app.cc
+++ b/chrome/browser/extensions/convert_web_app.cc
@@ -19,7 +19,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_file_value_serializer.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/numerics/safe_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
@@ -74,17 +73,17 @@
std::unique_ptr<base::DictionaryValue> CreateURLHandlersForBookmarkApp(
const GURL& scope_url,
const base::string16& title) {
- auto matches = base::MakeUnique<base::ListValue>();
+ auto matches = std::make_unique<base::ListValue>();
matches->AppendString(scope_url.GetOrigin().Resolve(scope_url.path()).spec() +
"*");
- auto scope_handler = base::MakeUnique<base::DictionaryValue>();
+ auto scope_handler = std::make_unique<base::DictionaryValue>();
scope_handler->SetList(keys::kMatches, std::move(matches));
// The URL handler title is not used anywhere but we set it to the
// web app's title just in case.
scope_handler->SetString(keys::kUrlHandlerTitle, base::UTF16ToUTF8(title));
- auto url_handlers = base::MakeUnique<base::DictionaryValue>();
+ auto url_handlers = std::make_unique<base::DictionaryValue>();
// Use "scope" as the url handler's identifier.
url_handlers->SetDictionary(kScopeUrlHandlerId, std::move(scope_handler));
return url_handlers;
@@ -179,8 +178,8 @@
}
// Add the icons and linked icon information.
- auto icons = base::MakeUnique<base::DictionaryValue>();
- auto linked_icons = base::MakeUnique<base::ListValue>();
+ auto icons = std::make_unique<base::DictionaryValue>();
+ auto linked_icons = std::make_unique<base::ListValue>();
for (const auto& icon : web_app.icons) {
std::string size = base::StringPrintf("%i", icon.width);
std::string icon_path = base::StringPrintf("%s/%s.png", kIconsDirName,
diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc
index 6f9b15f2..d5fb61e 100644
--- a/chrome/browser/extensions/convert_web_app_unittest.cc
+++ b/chrome/browser/extensions/convert_web_app_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <memory>
#include <string>
#include <vector>
@@ -13,7 +14,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
@@ -132,7 +132,7 @@
manifest.SetString(keys::kVersion, "0");
manifest.SetString(keys::kLaunchWebURL, "http://aaronboodman.com/gearpad/");
manifest.SetDictionary(keys::kUrlHandlers,
- base::MakeUnique<base::DictionaryValue>());
+ std::make_unique<base::DictionaryValue>());
std::string error;
scoped_refptr<Extension> bookmark_app =
@@ -160,14 +160,14 @@
// "title": "test handler"
// }
// }
- auto test_matches = base::MakeUnique<base::ListValue>();
+ auto test_matches = std::make_unique<base::ListValue>();
test_matches->AppendString("http://*.aaronboodman.com/");
- auto test_handler = base::MakeUnique<base::DictionaryValue>();
+ auto test_handler = std::make_unique<base::DictionaryValue>();
test_handler->SetList(keys::kMatches, std::move(test_matches));
test_handler->SetString(keys::kUrlHandlerTitle, "test handler");
- auto url_handlers = base::MakeUnique<base::DictionaryValue>();
+ auto url_handlers = std::make_unique<base::DictionaryValue>();
url_handlers->SetDictionary("test_url_handler", std::move(test_handler));
manifest.SetDictionary(keys::kUrlHandlers, std::move(url_handlers));
@@ -206,10 +206,10 @@
CreateURLHandlersForBookmarkApp(scope_url,
base::ASCIIToUTF16("Test App"));
- auto test_matches = base::MakeUnique<base::ListValue>();
+ auto test_matches = std::make_unique<base::ListValue>();
test_matches->AppendString("http://*.aaronboodman.com/");
- auto test_handler = base::MakeUnique<base::DictionaryValue>();
+ auto test_handler = std::make_unique<base::DictionaryValue>();
test_handler->SetList(keys::kMatches, std::move(test_matches));
test_handler->SetString(keys::kUrlHandlerTitle, "test handler");
diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc
index 277df69c..aa4854f 100644
--- a/chrome/browser/extensions/crx_installer.cc
+++ b/chrome/browser/extensions/crx_installer.cc
@@ -13,7 +13,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/sequenced_task_runner.h"
#include "base/strings/string_util.h"
@@ -584,12 +583,12 @@
}
// Run the policy, requirements and blacklist checks in parallel.
- check_group_ = base::MakeUnique<PreloadCheckGroup>();
+ check_group_ = std::make_unique<PreloadCheckGroup>();
- policy_check_ = base::MakeUnique<PolicyCheck>(profile_, extension());
- requirements_check_ = base::MakeUnique<RequirementsChecker>(extension());
+ policy_check_ = std::make_unique<PolicyCheck>(profile_, extension());
+ requirements_check_ = std::make_unique<RequirementsChecker>(extension());
blacklist_check_ =
- base::MakeUnique<BlacklistCheck>(Blacklist::Get(profile_), extension_);
+ std::make_unique<BlacklistCheck>(Blacklist::Get(profile_), extension_);
check_group_->AddCheck(policy_check_.get());
check_group_->AddCheck(requirements_check_.get());
@@ -1022,7 +1021,7 @@
service->profile(), extension());
client_->ShowDialog(base::Bind(&CrxInstaller::OnInstallPromptDone, this),
extension(), nullptr,
- base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
+ std::make_unique<ExtensionInstallPrompt::Prompt>(type),
ExtensionInstallPrompt::GetDefaultShowDialogCallback());
}
}
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index 9b861c1d..8250f12 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -189,7 +189,7 @@
std::unique_ptr<MockPromptProxy> CreateMockPromptProxyForBrowser(
Browser* browser) {
- return base::MakeUnique<MockPromptProxy>(
+ return std::make_unique<MockPromptProxy>(
browser->tab_strip_model()->GetActiveWebContents());
}
diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc
index 69fe0fdc..642f75c 100644
--- a/chrome/browser/extensions/default_apps.cc
+++ b/chrome/browser/extensions/default_apps.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <memory>
#include <set>
#include <string>
@@ -139,7 +140,7 @@
void Provider::VisitRegisteredExtension() {
if (!profile_ || !ShouldInstallInProfile()) {
- SetPrefs(base::MakeUnique<base::DictionaryValue>());
+ SetPrefs(std::make_unique<base::DictionaryValue>());
return;
}
diff --git a/chrome/browser/extensions/error_console/error_console.cc b/chrome/browser/extensions/error_console/error_console.cc
index fbd56ce..c5a15da 100644
--- a/chrome/browser/extensions/error_console/error_console.cc
+++ b/chrome/browser/extensions/error_console/error_console.cc
@@ -102,7 +102,7 @@
mask &= ~(1 << type);
prefs_->UpdateExtensionPref(extension_id, kStoreExtensionErrorsPref,
- base::MakeUnique<base::Value>(mask));
+ std::make_unique<base::Value>(mask));
}
void ErrorConsole::SetReportingAllForExtension(
@@ -114,7 +114,7 @@
int mask = enabled ? (1 << ExtensionError::NUM_ERROR_TYPES) - 1 : 0;
prefs_->UpdateExtensionPref(extension_id, kStoreExtensionErrorsPref,
- base::MakeUnique<base::Value>(mask));
+ std::make_unique<base::Value>(mask));
}
bool ErrorConsole::IsReportingEnabledForExtension(
diff --git a/chrome/browser/extensions/event_router_forwarder.cc b/chrome/browser/extensions/event_router_forwarder.cc
index 54a742c..d2663bd 100644
--- a/chrome/browser/extensions/event_router_forwarder.cc
+++ b/chrome/browser/extensions/event_router_forwarder.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/event_router_forwarder.h"
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/bind.h"
@@ -132,7 +133,7 @@
return;
#endif
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
histogram_value, event_name, std::move(event_args), restrict_to_profile);
event->event_url = event_url;
if (extension_id.empty()) {
diff --git a/chrome/browser/extensions/extension_action_manager.cc b/chrome/browser/extensions/extension_action_manager.cc
index aefbcc0..f8144fa 100644
--- a/chrome/browser/extensions/extension_action_manager.cc
+++ b/chrome/browser/extensions/extension_action_manager.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/extension_action_manager.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/profiles/profile.h"
@@ -111,10 +110,10 @@
}
auto action =
- base::MakeUnique<ExtensionAction>(extension, action_type, *action_info);
+ std::make_unique<ExtensionAction>(extension, action_type, *action_info);
if (action->default_icon()) {
- action->SetDefaultIconImage(base::MakeUnique<IconImage>(
+ action->SetDefaultIconImage(std::make_unique<IconImage>(
profile, &extension, *action->default_icon(),
ExtensionAction::ActionIconSize(),
ExtensionAction::FallbackIcon().AsImageSkia(), nullptr));
@@ -154,7 +153,7 @@
// If no ActionInfo exists for |extension|, create and return a new action
// with a blank ActionInfo.
// Populate any missing values from |extension|'s manifest.
- return base::MakeUnique<ExtensionAction>(extension, type,
+ return std::make_unique<ExtensionAction>(extension, type,
info ? *info : ActionInfo());
}
diff --git a/chrome/browser/extensions/extension_action_runner.cc b/chrome/browser/extensions/extension_action_runner.cc
index 7ea023c..c97dac8 100644
--- a/chrome/browser/extensions/extension_action_runner.cc
+++ b/chrome/browser/extensions/extension_action_runner.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/location.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
@@ -359,7 +358,7 @@
base::BindOnce(callback, *default_bubble_close_action_for_testing_));
} else {
toolbar_actions_bar->ShowToolbarActionBubble(
- base::MakeUnique<BlockedActionBubbleDelegate>(callback,
+ std::make_unique<BlockedActionBubbleDelegate>(callback,
extension->id()));
}
}
diff --git a/chrome/browser/extensions/extension_action_runner_browsertest.cc b/chrome/browser/extensions/extension_action_runner_browsertest.cc
index 3b1812e..5a3e9a7 100644
--- a/chrome/browser/extensions/extension_action_runner_browsertest.cc
+++ b/chrome/browser/extensions/extension_action_runner_browsertest.cc
@@ -12,7 +12,6 @@
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "chrome/browser/extensions/extension_action.h"
@@ -319,17 +318,17 @@
// The extensions that operate on explicit hosts have permission; the ones
// that request all hosts require user consent.
std::vector<std::unique_ptr<ActiveScriptTester>> testers;
- testers.push_back(base::MakeUnique<ActiveScriptTester>(
+ testers.push_back(std::make_unique<ActiveScriptTester>(
"inject_scripts_all_hosts", CreateExtension(ALL_HOSTS, EXECUTE_SCRIPT),
browser(), REQUIRES_CONSENT, EXECUTE_SCRIPT));
- testers.push_back(base::MakeUnique<ActiveScriptTester>(
+ testers.push_back(std::make_unique<ActiveScriptTester>(
"inject_scripts_explicit_hosts",
CreateExtension(EXPLICIT_HOSTS, EXECUTE_SCRIPT), browser(),
DOES_NOT_REQUIRE_CONSENT, EXECUTE_SCRIPT));
- testers.push_back(base::MakeUnique<ActiveScriptTester>(
+ testers.push_back(std::make_unique<ActiveScriptTester>(
"content_scripts_all_hosts", CreateExtension(ALL_HOSTS, CONTENT_SCRIPT),
browser(), REQUIRES_CONSENT, CONTENT_SCRIPT));
- testers.push_back(base::MakeUnique<ActiveScriptTester>(
+ testers.push_back(std::make_unique<ActiveScriptTester>(
"content_scripts_explicit_hosts",
CreateExtension(EXPLICIT_HOSTS, CONTENT_SCRIPT), browser(),
DOES_NOT_REQUIRE_CONSENT, CONTENT_SCRIPT));
@@ -470,7 +469,7 @@
// Wire up the runner to automatically accept the bubble to prompt for page
// refresh.
runner->set_default_bubble_close_action_for_testing(
- base::MakeUnique<ToolbarActionsBarBubbleDelegate::CloseAction>(
+ std::make_unique<ToolbarActionsBarBubbleDelegate::CloseAction>(
ToolbarActionsBarBubbleDelegate::CLOSE_EXECUTE));
content::NavigationEntry* entry =
@@ -506,7 +505,7 @@
const int next_nav_id =
web_contents->GetController().GetLastCommittedEntry()->GetUniqueID();
runner->set_default_bubble_close_action_for_testing(
- base::MakeUnique<ToolbarActionsBarBubbleDelegate::CloseAction>(
+ std::make_unique<ToolbarActionsBarBubbleDelegate::CloseAction>(
ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_USER_ACTION));
// Try running the extension. Nothing should happen, because the user
@@ -521,7 +520,7 @@
// Repeat with a dismissal from bubble deactivation - same story.
runner->set_default_bubble_close_action_for_testing(
- base::MakeUnique<ToolbarActionsBarBubbleDelegate::CloseAction>(
+ std::make_unique<ToolbarActionsBarBubbleDelegate::CloseAction>(
ToolbarActionsBarBubbleDelegate::CLOSE_DISMISS_DEACTIVATION));
runner->RunAction(extension, true);
base::RunLoop().RunUntilIdle();
@@ -546,10 +545,10 @@
IN_PROC_BROWSER_TEST_F(FlagOffExtensionActionRunnerBrowserTest,
ScriptsExecuteWhenFlagAbsent) {
std::vector<std::unique_ptr<ActiveScriptTester>> testers;
- testers.push_back(base::MakeUnique<ActiveScriptTester>(
+ testers.push_back(std::make_unique<ActiveScriptTester>(
"content_scripts_all_hosts", CreateExtension(ALL_HOSTS, CONTENT_SCRIPT),
browser(), DOES_NOT_REQUIRE_CONSENT, CONTENT_SCRIPT));
- testers.push_back(base::MakeUnique<ActiveScriptTester>(
+ testers.push_back(std::make_unique<ActiveScriptTester>(
"inject_scripts_all_hosts", CreateExtension(ALL_HOSTS, EXECUTE_SCRIPT),
browser(), DOES_NOT_REQUIRE_CONSENT, EXECUTE_SCRIPT));
diff --git a/chrome/browser/extensions/extension_action_test_util.cc b/chrome/browser/extensions/extension_action_test_util.cc
index ec60619..5314e6b 100644
--- a/chrome/browser/extensions/extension_action_test_util.cc
+++ b/chrome/browser/extensions/extension_action_test_util.cc
@@ -6,7 +6,6 @@
#include <memory>
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "chrome/browser/extensions/extension_action.h"
#include "chrome/browser/extensions/extension_action_manager.h"
@@ -56,7 +55,7 @@
// Creates a new ToolbarActionsModel for the given |context|.
std::unique_ptr<KeyedService> BuildToolbarModel(
content::BrowserContext* context) {
- return base::MakeUnique<ToolbarActionsModel>(
+ return std::make_unique<ToolbarActionsModel>(
Profile::FromBrowserContext(context),
extensions::ExtensionPrefs::Get(context));
}
diff --git a/chrome/browser/extensions/extension_action_unittest.cc b/chrome/browser/extensions/extension_action_unittest.cc
index 2cbd0a1..c4452bc 100644
--- a/chrome/browser/extensions/extension_action_unittest.cc
+++ b/chrome/browser/extensions/extension_action_unittest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/extension_action.h"
-#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "chrome/common/extensions/api/extension_action/action_info.h"
#include "extensions/common/extension_builder.h"
@@ -18,7 +17,7 @@
std::unique_ptr<ExtensionAction> CreateAction(ActionInfo::Type type,
const ActionInfo& action_info) {
scoped_refptr<const Extension> extension = ExtensionBuilder("Test").Build();
- return base::MakeUnique<ExtensionAction>(*extension, type, action_info);
+ return std::make_unique<ExtensionAction>(*extension, type, action_info);
}
} // namespace
diff --git a/chrome/browser/extensions/extension_assets_manager_chromeos.cc b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
index 916d3514..cc3de99 100644
--- a/chrome/browser/extensions/extension_assets_manager_chromeos.cc
+++ b/chrome/browser/extensions/extension_assets_manager_chromeos.cc
@@ -7,13 +7,13 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include <utility>
#include <vector>
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/singleton.h"
#include "base/sequenced_task_runner.h"
#include "base/sys_info.h"
@@ -383,16 +383,16 @@
DictionaryPrefUpdate shared_extensions(local_state, kSharedExtensions);
base::DictionaryValue* extension_info_weak = NULL;
if (!shared_extensions->GetDictionary(id, &extension_info_weak)) {
- auto extension_info = base::MakeUnique<base::DictionaryValue>();
+ auto extension_info = std::make_unique<base::DictionaryValue>();
extension_info_weak = extension_info.get();
shared_extensions->Set(id, std::move(extension_info));
}
CHECK(!shared_extensions->HasKey(version));
- auto version_info = base::MakeUnique<base::DictionaryValue>();
+ auto version_info = std::make_unique<base::DictionaryValue>();
version_info->SetString(kSharedExtensionPath, shared_version_dir.value());
- auto users = base::MakeUnique<base::ListValue>();
+ auto users = std::make_unique<base::ListValue>();
for (size_t i = 0; i < pending_installs.size(); i++) {
ExtensionAssetsManagerHelper::PendingInstallInfo& info =
pending_installs[i];
diff --git a/chrome/browser/extensions/extension_context_menu_model_unittest.cc b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
index 0f0e0a9..d684bc1d 100644
--- a/chrome/browser/extensions/extension_context_menu_model_unittest.cc
+++ b/chrome/browser/extensions/extension_context_menu_model_unittest.cc
@@ -74,7 +74,7 @@
~MenuBuilder() {}
std::unique_ptr<ExtensionContextMenuModel> BuildMenu() {
- return base::MakeUnique<ExtensionContextMenuModel>(
+ return std::make_unique<ExtensionContextMenuModel>(
extension_.get(), browser_, ExtensionContextMenuModel::VISIBLE,
nullptr);
}
@@ -85,7 +85,7 @@
id.uid = ++cur_id_;
menu_manager_->AddContextItem(
extension_.get(),
- base::MakeUnique<MenuItem>(id, kTestExtensionItemLabel,
+ std::make_unique<MenuItem>(id, kTestExtensionItemLabel,
false, // check`ed
true, // visible
true, // enabled
diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc
index 147aeb21..825c3f4 100644
--- a/chrome/browser/extensions/extension_disabled_ui.cc
+++ b/chrome/browser/extensions/extension_disabled_ui.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/scoped_observer.h"
#include "base/single_thread_task_runner.h"
@@ -374,7 +373,7 @@
const Extension* extension = service->GetInstalledExtension(extension_id);
if (extension) {
GlobalErrorServiceFactory::GetForProfile(service->profile())
- ->AddGlobalError(base::MakeUnique<ExtensionDisabledGlobalError>(
+ ->AddGlobalError(std::make_unique<ExtensionDisabledGlobalError>(
service.get(), extension, is_remote_install, icon));
}
}
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
index ede4187e8..97e6725 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
@@ -4,12 +4,12 @@
#include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"
+#include <memory>
#include <string>
#include <utility>
#include <vector>
#include "base/files/file_util.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/values.h"
@@ -92,16 +92,16 @@
base::DictionaryValue* extension_info_weak = NULL;
if (!shared_extensions->GetDictionary(id, &extension_info_weak)) {
- auto extension_info = base::MakeUnique<base::DictionaryValue>();
+ auto extension_info = std::make_unique<base::DictionaryValue>();
extension_info_weak = extension_info.get();
shared_extensions->Set(id, std::move(extension_info));
}
- auto version_info = base::MakeUnique<base::DictionaryValue>();
+ auto version_info = std::make_unique<base::DictionaryValue>();
version_info->SetString(
ExtensionAssetsManagerChromeOS::kSharedExtensionPath, path.value());
- auto users = base::MakeUnique<base::ListValue>();
+ auto users = std::make_unique<base::ListValue>();
for (const std::string& user :
base::SplitString(users_string, ",", base::KEEP_WHITESPACE,
base::SPLIT_WANT_NONEMPTY)) {
diff --git a/chrome/browser/extensions/extension_garbage_collector_factory.cc b/chrome/browser/extensions/extension_garbage_collector_factory.cc
index 5b2b4044..16823f1 100644
--- a/chrome/browser/extensions/extension_garbage_collector_factory.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_factory.cc
@@ -4,7 +4,8 @@
#include "chrome/browser/extensions/extension_garbage_collector_factory.h"
-#include "base/memory/ptr_util.h"
+#include <memory>
+
#include "base/memory/singleton.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_garbage_collector.h"
@@ -48,9 +49,9 @@
ExtensionGarbageCollectorFactory::BuildInstanceFor(
content::BrowserContext* context) {
#if defined(OS_CHROMEOS)
- return base::MakeUnique<ExtensionGarbageCollectorChromeOS>(context);
+ return std::make_unique<ExtensionGarbageCollectorChromeOS>(context);
#else
- return base::MakeUnique<ExtensionGarbageCollector>(context);
+ return std::make_unique<ExtensionGarbageCollector>(context);
#endif
}
diff --git a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
index 8dace99..3280a52 100644
--- a/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
+++ b/chrome/browser/extensions/extension_gcm_app_handler_unittest.cc
@@ -206,7 +206,7 @@
scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
base::CreateSequencedTaskRunnerWithTraits(
{base::MayBlock(), base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}));
- return base::MakeUnique<gcm::GCMProfileService>(
+ return std::make_unique<gcm::GCMProfileService>(
profile->GetPrefs(), profile->GetPath(), profile->GetRequestContext(),
chrome::GetChannel(),
gcm::GetProductCategoryForSubtypes(profile->GetPrefs()),
@@ -279,7 +279,7 @@
base::DictionaryValue manifest;
manifest.SetString(manifest_keys::kVersion, "1.0.0.0");
manifest.SetString(manifest_keys::kName, kTestExtensionName);
- auto permission_list = base::MakeUnique<base::ListValue>();
+ auto permission_list = std::make_unique<base::ListValue>();
permission_list->AppendString("gcm");
manifest.Set(manifest_keys::kPermissions, std::move(permission_list));
diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc
index e8b261b..9ec559c 100644
--- a/chrome/browser/extensions/extension_icon_manager_unittest.cc
+++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc
@@ -4,10 +4,11 @@
#include "chrome/browser/extensions/extension_icon_manager.h"
+#include <memory>
+
#include "base/command_line.h"
#include "base/json/json_file_value_serializer.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/path_service.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
@@ -42,7 +43,7 @@
command_line_.GetProcessCommandLine()->AppendSwitchASCII(
switches::kForceDeviceScaleFactor, base::StringPrintf("%3.2f", scale));
// This has to be inited after fiddling with the command line.
- test_screen_ = base::MakeUnique<display::test::TestScreen>();
+ test_screen_ = std::make_unique<display::test::TestScreen>();
display::Screen::SetScreenInstance(test_screen_.get());
}
@@ -193,7 +194,7 @@
// Test what bitmaps are loaded when various combinations of scale factors are
// supported.
TEST_F(ExtensionIconManagerTest, ScaleFactors) {
- auto profile = base::MakeUnique<TestingProfile>();
+ auto profile = std::make_unique<TestingProfile>();
const gfx::Image default_icon = GetDefaultIcon();
base::FilePath test_dir;
diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc
index 4799fe4..389b421 100644
--- a/chrome/browser/extensions/extension_install_prompt.cc
+++ b/chrome/browser/extensions/extension_install_prompt.cc
@@ -8,7 +8,6 @@
#include "base/callback_helpers.h"
#include "base/location.h"
-#include "base/memory/ptr_util.h"
#include "base/single_thread_task_runner.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -652,7 +651,7 @@
const SkBitmap* icon,
const ShowDialogCallback& show_dialog_callback) {
ShowDialog(done_callback, extension, icon,
- base::MakeUnique<Prompt>(INSTALL_PROMPT), show_dialog_callback);
+ std::make_unique<Prompt>(INSTALL_PROMPT), show_dialog_callback);
}
void ExtensionInstallPrompt::ShowDialog(
diff --git a/chrome/browser/extensions/extension_install_prompt_unittest.cc b/chrome/browser/extensions/extension_install_prompt_unittest.cc
index a78e06c..7f6934e 100644
--- a/chrome/browser/extensions/extension_install_prompt_unittest.cc
+++ b/chrome/browser/extensions/extension_install_prompt_unittest.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "chrome/browser/extensions/extension_install_prompt_show_params.h"
@@ -120,7 +119,7 @@
base::RunLoop run_loop;
prompt.ShowDialog(
ExtensionInstallPrompt::DoneCallback(), extension.get(), nullptr,
- base::MakeUnique<ExtensionInstallPrompt::Prompt>(
+ std::make_unique<ExtensionInstallPrompt::Prompt>(
ExtensionInstallPrompt::PERMISSIONS_PROMPT),
std::move(permission_set),
base::Bind(&VerifyPromptPermissionsCallback, run_loop.QuitClosure(),
diff --git a/chrome/browser/extensions/extension_keybinding_registry.cc b/chrome/browser/extensions/extension_keybinding_registry.cc
index 38db1f7..234c1bcf 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.cc
+++ b/chrome/browser/extensions/extension_keybinding_registry.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/extension_keybinding_registry.h"
+#include <memory>
#include <utility>
#include "base/values.h"
@@ -123,7 +124,7 @@
args->AppendString(command);
auto event =
- base::MakeUnique<Event>(events::COMMANDS_ON_COMMAND, kOnCommandEventName,
+ std::make_unique<Event>(events::COMMANDS_ON_COMMAND, kOnCommandEventName,
std::move(args), browser_context_);
event->user_gesture = EventRouter::USER_GESTURE_ENABLED;
EventRouter::Get(browser_context_)
diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc
index f593d7f0..bc6fe02 100644
--- a/chrome/browser/extensions/extension_management.cc
+++ b/chrome/browser/extensions/extension_management.cc
@@ -9,7 +9,6 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/stl_util.h"
#include "base/strings/string16.h"
@@ -68,9 +67,9 @@
// be called in the initialization of ExtensionManagement.
Refresh();
providers_.push_back(
- base::MakeUnique<StandardManagementPolicyProvider>(this));
+ std::make_unique<StandardManagementPolicyProvider>(this));
providers_.push_back(
- base::MakeUnique<PermissionsBasedManagementPolicyProvider>(this));
+ std::make_unique<PermissionsBasedManagementPolicyProvider>(this));
}
ExtensionManagement::~ExtensionManagement() {
@@ -470,7 +469,7 @@
std::unique_ptr<base::DictionaryValue>
ExtensionManagement::GetInstallListByMode(
InstallationMode installation_mode) const {
- auto extension_dict = base::MakeUnique<base::DictionaryValue>();
+ auto extension_dict = std::make_unique<base::DictionaryValue>();
for (const auto& entry : settings_by_id_) {
if (entry.second->installation_mode == installation_mode) {
ExternalPolicyLoader::AddExtension(extension_dict.get(), entry.first,
@@ -507,7 +506,7 @@
std::unique_ptr<internal::IndividualSettings>& settings = settings_by_id_[id];
if (!settings) {
settings =
- base::MakeUnique<internal::IndividualSettings>(default_settings_.get());
+ std::make_unique<internal::IndividualSettings>(default_settings_.get());
}
return settings.get();
}
@@ -519,7 +518,7 @@
settings_by_update_url_[update_url];
if (!settings) {
settings =
- base::MakeUnique<internal::IndividualSettings>(default_settings_.get());
+ std::make_unique<internal::IndividualSettings>(default_settings_.get());
}
return settings.get();
}
diff --git a/chrome/browser/extensions/extension_management_test_util.cc b/chrome/browser/extensions/extension_management_test_util.cc
index fc7cc81..a4dca0f 100644
--- a/chrome/browser/extensions/extension_management_test_util.cc
+++ b/chrome/browser/extensions/extension_management_test_util.cc
@@ -7,7 +7,6 @@
#include <string>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "components/crx_file/id_util.h"
#include "components/policy/core/common/configuration_policy_provider.h"
#include "components/policy/core/common/mock_configuration_policy_provider.h"
@@ -49,7 +48,7 @@
void ExtensionManagementPrefUpdaterBase::ClearPerExtensionSettings(
const ExtensionId& id) {
DCHECK(crx_file::id_util::IdIsValid(id));
- pref_->SetWithoutPathExpansion(id, base::MakeUnique<base::DictionaryValue>());
+ pref_->SetWithoutPathExpansion(id, std::make_unique<base::DictionaryValue>());
}
// Helper functions for 'installation_mode' manipulation -----------------------
@@ -260,7 +259,7 @@
}
void ExtensionManagementPrefUpdaterBase::ClearList(const std::string& path) {
- pref_->Set(path, base::MakeUnique<base::ListValue>());
+ pref_->Set(path, std::make_unique<base::ListValue>());
}
void ExtensionManagementPrefUpdaterBase::AddStringToList(
@@ -268,12 +267,12 @@
const std::string& str) {
base::ListValue* list_value_weak = nullptr;
if (!pref_->GetList(path, &list_value_weak)) {
- auto list_value = base::MakeUnique<base::ListValue>();
+ auto list_value = std::make_unique<base::ListValue>();
list_value_weak = list_value.get();
pref_->Set(path, std::move(list_value));
}
CHECK(
- list_value_weak->AppendIfNotPresent(base::MakeUnique<base::Value>(str)));
+ list_value_weak->AppendIfNotPresent(std::make_unique<base::Value>(str)));
}
void ExtensionManagementPrefUpdaterBase::RemoveStringFromList(
diff --git a/chrome/browser/extensions/extension_management_unittest.cc b/chrome/browser/extensions/extension_management_unittest.cc
index e23720e..dc6ad71c 100644
--- a/chrome/browser/extensions/extension_management_unittest.cc
+++ b/chrome/browser/extensions/extension_management_unittest.cc
@@ -9,7 +9,6 @@
#include <vector>
#include "base/json/json_parser.h"
-#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/values.h"
#include "chrome/browser/extensions/extension_management_internal.h"
@@ -266,7 +265,7 @@
void CreateHostedApp(Manifest::Location location) {
base::DictionaryValue values;
values.Set(extensions::manifest_keys::kWebURLs,
- base::MakeUnique<base::ListValue>());
+ std::make_unique<base::ListValue>());
values.SetString(extensions::manifest_keys::kLaunchWebURL,
"http://www.example.com");
CreateExtensionFromValues(location, &values);
diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc
index 657234d..4034bbb 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/extension_message_bubble_controller.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/lazy_instance.h"
#include "base/metrics/histogram_macros.h"
@@ -71,7 +73,7 @@
extensions::ExtensionPrefs* prefs = extensions::ExtensionPrefs::Get(profile_);
prefs->UpdateExtensionPref(
extension_id, pref_name,
- value ? base::MakeUnique<base::Value>(value) : nullptr);
+ value ? std::make_unique<base::Value>(value) : nullptr);
}
std::string
diff --git a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
index eebab8f..397d6f3 100644
--- a/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
+++ b/chrome/browser/extensions/extension_message_bubble_controller_unittest.cc
@@ -4,12 +4,12 @@
#include <stddef.h>
+#include <memory>
#include <utility>
#include "base/bind_helpers.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -58,13 +58,13 @@
std::unique_ptr<KeyedService> BuildOverrideRegistrar(
content::BrowserContext* context) {
- return base::MakeUnique<extensions::ExtensionWebUIOverrideRegistrar>(context);
+ return std::make_unique<extensions::ExtensionWebUIOverrideRegistrar>(context);
}
// Creates a new ToolbarActionsModel for the given |context|.
std::unique_ptr<KeyedService> BuildToolbarModel(
content::BrowserContext* context) {
- return base::MakeUnique<ToolbarActionsModel>(
+ return std::make_unique<ToolbarActionsModel>(
Profile::FromBrowserContext(context),
extensions::ExtensionPrefs::Get(context));
}
@@ -852,7 +852,7 @@
Init();
ASSERT_TRUE(LoadExtensionOverridingNtp("1", kId1, Manifest::UNPACKED));
- auto controller = base::MakeUnique<TestExtensionMessageBubbleController>(
+ auto controller = std::make_unique<TestExtensionMessageBubbleController>(
new NtpOverriddenBubbleDelegate(browser()->profile()), browser());
controller->SetIsActiveBubble();
@@ -885,7 +885,7 @@
Init();
ASSERT_TRUE(LoadExtensionOverridingNtp("1", kId1, Manifest::COMMAND_LINE));
- auto controller = base::MakeUnique<TestExtensionMessageBubbleController>(
+ auto controller = std::make_unique<TestExtensionMessageBubbleController>(
new SuspiciousExtensionBubbleDelegate(browser()->profile()), browser());
controller->SetIsActiveBubble();
FakeExtensionMessageBubble bubble;
@@ -941,7 +941,7 @@
ASSERT_TRUE(LoadGenericExtension("2", kId2, Manifest::UNPACKED));
ASSERT_TRUE(LoadGenericExtension("3", kId3, Manifest::UNPACKED));
- auto controller = base::MakeUnique<TestExtensionMessageBubbleController>(
+ auto controller = std::make_unique<TestExtensionMessageBubbleController>(
new DevModeBubbleDelegate(browser()->profile()), browser());
controller->SetIsActiveBubble();
@@ -1128,7 +1128,7 @@
ExtensionPrefs* prefs) {
std::string time_str = base::Int64ToString(time.ToInternalValue());
prefs->UpdateExtensionPref(extension_id, "install_time",
- base::MakeUnique<base::Value>(time_str));
+ std::make_unique<base::Value>(time_str));
}
// The feature this is meant to test is only implemented on Windows and Mac.
diff --git a/chrome/browser/extensions/extension_messages_apitest.cc b/chrome/browser/extensions/extension_messages_apitest.cc
index 1538c309..4663c72a 100644
--- a/chrome/browser/extensions/extension_messages_apitest.cc
+++ b/chrome/browser/extensions/extension_messages_apitest.cc
@@ -144,7 +144,7 @@
Profile* profile,
GURL event_url) {
auto event =
- base::MakeUnique<Event>(events::TEST_ON_MESSAGE, "test.onMessage",
+ std::make_unique<Event>(events::TEST_ON_MESSAGE, "test.onMessage",
std::move(event_args), profile);
event->event_url = event_url;
return event;
diff --git a/chrome/browser/extensions/extension_migrator_unittest.cc b/chrome/browser/extensions/extension_migrator_unittest.cc
index bfb0141..472e581 100644
--- a/chrome/browser/extensions/extension_migrator_unittest.cc
+++ b/chrome/browser/extensions/extension_migrator_unittest.cc
@@ -4,9 +4,10 @@
#include "chrome/browser/extensions/extension_migrator.h"
+#include <memory>
+
#include "base/files/file_util.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h"
@@ -52,7 +53,7 @@
}
void AddMigratorProvider() {
- service()->AddProviderForTesting(base::MakeUnique<ExternalProviderImpl>(
+ service()->AddProviderForTesting(std::make_unique<ExternalProviderImpl>(
service(), new ExtensionMigrator(profile(), kOldId, kNewId), profile(),
Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT));
diff --git a/chrome/browser/extensions/extension_navigation_throttle_unittest.cc b/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
index 3431bff8..341f369 100644
--- a/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
+++ b/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
@@ -3,7 +3,8 @@
// found in the LICENSE file.
#include "extensions/browser/extension_navigation_throttle.h"
-#include "base/memory/ptr_util.h"
+
+#include <memory>
#include "base/strings/stringprintf.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "components/crx_file/id_util.h"
@@ -41,7 +42,7 @@
std::vector<std::unique_ptr<NavigationThrottle>> CreateThrottlesForNavigation(
content::NavigationHandle* handle) override {
std::vector<std::unique_ptr<NavigationThrottle>> throttles;
- throttles.push_back(base::MakeUnique<ExtensionNavigationThrottle>(handle));
+ throttles.push_back(std::make_unique<ExtensionNavigationThrottle>(handle));
return throttles;
}
};
diff --git a/chrome/browser/extensions/extension_override_apitest.cc b/chrome/browser/extensions/extension_override_apitest.cc
index ab5ed0e..52f913e5 100644
--- a/chrome/browser/extensions/extension_override_apitest.cc
+++ b/chrome/browser/extensions/extension_override_apitest.cc
@@ -4,9 +4,9 @@
#include <stddef.h>
+#include <memory>
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/threading/thread_restrictions.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -328,7 +328,7 @@
// a preferences file without corresponding UnloadExtension() calls. This is
// the same as the above test, except for that it is testing the case where
// the file already contains dupes when an extension is loaded.
- auto list = base::MakeUnique<base::ListValue>();
+ auto list = std::make_unique<base::ListValue>();
for (size_t i = 0; i < 3; ++i) {
std::unique_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
dict->SetString("entry", "http://www.google.com/");
diff --git a/chrome/browser/extensions/extension_protocols_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 04c432e5..7f3931dd7 100644
--- a/chrome/browser/extensions/extension_protocols_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -11,7 +11,6 @@
#include "base/command_line.h"
#include "base/files/file_util.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
@@ -105,7 +104,7 @@
manifest.SetString("name", "An extension with web-accessible resources");
manifest.SetString("version", "2");
- auto web_accessible_list = base::MakeUnique<base::ListValue>();
+ auto web_accessible_list = std::make_unique<base::ListValue>();
web_accessible_list->AppendString("test.dat");
manifest.Set("web_accessible_resources", std::move(web_accessible_list));
@@ -160,7 +159,7 @@
read_contents_.clear();
waiting_for_extension_id_.reset();
seen_done_reading_extension_ids_.clear();
- run_loop_ = base::MakeUnique<base::RunLoop>();
+ run_loop_ = std::make_unique<base::RunLoop>();
}
private:
@@ -199,7 +198,7 @@
switches::kExtensionContentVerification,
switches::kExtensionContentVerificationEnforce);
content_verifier_ = new ContentVerifier(
- testing_profile_.get(), base::MakeUnique<ChromeContentVerifierDelegate>(
+ testing_profile_.get(), std::make_unique<ChromeContentVerifierDelegate>(
testing_profile_.get()));
extension_info_map_->SetContentVerifier(content_verifier_.get());
}
diff --git a/chrome/browser/extensions/extension_reenabler.cc b/chrome/browser/extensions/extension_reenabler.cc
index bf88490..9f70b574 100644
--- a/chrome/browser/extensions/extension_reenabler.cc
+++ b/chrome/browser/extensions/extension_reenabler.cc
@@ -97,7 +97,7 @@
base::Bind(&ExtensionReenabler::OnInstallPromptDone,
weak_factory_.GetWeakPtr()),
extension.get(), nullptr,
- base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
+ std::make_unique<ExtensionInstallPrompt::Prompt>(type),
show_dialog_callback_);
}
}
@@ -173,7 +173,7 @@
base::Bind(&ExtensionReenabler::OnInstallPromptDone,
weak_factory_.GetWeakPtr()),
extension_.get(), nullptr,
- base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
+ std::make_unique<ExtensionInstallPrompt::Prompt>(type),
show_dialog_callback_);
}
}
diff --git a/chrome/browser/extensions/extension_service_sync_unittest.cc b/chrome/browser/extensions/extension_service_sync_unittest.cc
index c81b838..fce1869 100644
--- a/chrome/browser/extensions/extension_service_sync_unittest.cc
+++ b/chrome/browser/extensions/extension_service_sync_unittest.cc
@@ -194,7 +194,7 @@
// want to
// give up ownership of a local change processor.
std::unique_ptr<syncer::SyncChangeProcessor> GetWrapped() {
- return base::MakeUnique<syncer::SyncChangeProcessorWrapperForTest>(this);
+ return std::make_unique<syncer::SyncChangeProcessorWrapperForTest>(this);
}
protected:
@@ -222,8 +222,8 @@
ASSERT_TRUE(type == syncer::EXTENSIONS || type == syncer::APPS);
extension_sync_service()->MergeDataAndStartSyncing(
type, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
void DisableExtensionFromSync(const Extension& extension,
@@ -332,8 +332,8 @@
// Once sync starts, flare should no longer be invoked.
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
path = data_dir().AppendASCII("page_action.crx");
InstallCRX(path, INSTALL_NEW);
EXPECT_FALSE(flare_was_called);
@@ -367,8 +367,8 @@
// Sync starts up.
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// Then sync data arrives telling us to disable |good0|.
ExtensionSyncData disable_good_crx(
@@ -403,11 +403,11 @@
syncer::FakeSyncChangeProcessor* processor_raw = nullptr;
{
- auto processor = base::MakeUnique<syncer::FakeSyncChangeProcessor>();
+ auto processor = std::make_unique<syncer::FakeSyncChangeProcessor>();
processor_raw = processor.get();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(), std::move(processor),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
processor_raw->changes().clear();
@@ -489,11 +489,11 @@
syncer::FakeSyncChangeProcessor* processor_raw = nullptr;
{
- auto processor = base::MakeUnique<syncer::FakeSyncChangeProcessor>();
+ auto processor = std::make_unique<syncer::FakeSyncChangeProcessor>();
processor_raw = processor.get();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(), std::move(processor),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
processor_raw->changes().clear();
@@ -576,8 +576,8 @@
sync_data.push_back(enable_good2.GetSyncData());
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, sync_data,
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
// Both sync changes should be ignored, since the local state was changed
// before sync started, and so the local state is considered more recent.
@@ -608,7 +608,7 @@
new syncer::FakeSyncChangeProcessor;
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(), base::WrapUnique(processor),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
processor->changes().clear();
@@ -688,8 +688,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
syncer::SyncDataList list =
extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
@@ -717,8 +717,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
{
syncer::SyncDataList list =
@@ -796,8 +796,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
syncer::SyncDataList list =
extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
@@ -825,8 +825,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::APPS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
syncer::SyncDataList list =
extension_sync_service()->GetAllSyncData(syncer::EXTENSIONS);
@@ -841,8 +841,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
{
syncer::SyncDataList list =
@@ -911,8 +911,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
StartSyncing(syncer::APPS);
UninstallExtension(good_crx);
@@ -944,8 +944,8 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::APPS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
syncer::StringOrdinal initial_ordinal =
syncer::StringOrdinal::CreateInitialOrdinal();
@@ -1048,12 +1048,12 @@
extension_sync_service()->MergeDataAndStartSyncing(
syncer::APPS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
service()->DisableExtension(page_action,
extensions::disable_reason::DISABLE_USER_ACTION);
@@ -1068,8 +1068,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -1142,8 +1142,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service()->IsExtensionEnabled(good_crx));
@@ -1154,7 +1154,7 @@
auto get_permissions_modifier = [this]() {
const Extension* extension = registry()->GetExtensionById(
good_crx, extensions::ExtensionRegistry::EVERYTHING);
- return base::MakeUnique<ScriptingPermissionsModifier>(profile(), extension);
+ return std::make_unique<ScriptingPermissionsModifier>(profile(), extension);
};
EXPECT_FALSE(get_permissions_modifier()->HasSetAllowedOnAllUrls());
const bool kDefaultAllowedScripting =
@@ -1239,8 +1239,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
const base::FilePath path = data_dir().AppendASCII("good.crx");
const ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
@@ -1319,8 +1319,8 @@
InitializeExtensionServiceWithUpdater();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
TerminateExtension(good_crx);
@@ -1349,8 +1349,8 @@
InitializeExtensionServiceWithUpdater();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
InstallCRX(data_dir().AppendASCII("good.crx"), INSTALL_NEW);
EXPECT_TRUE(service()->IsExtensionEnabled(good_crx));
@@ -1431,8 +1431,8 @@
InitializeExtensionServiceWithUpdater();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
sync_pb::EntitySpecifics specifics;
sync_pb::ExtensionSpecifics* ext_specifics = specifics.mutable_extension();
@@ -1465,8 +1465,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
const ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
@@ -1590,8 +1590,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
base::FilePath base_path = data_dir().AppendASCII("permissions_increase");
base::FilePath pem_path = base_path.AppendASCII("permissions.pem");
@@ -1635,8 +1635,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
const base::FilePath base_path =
data_dir().AppendASCII("permissions_increase");
@@ -1795,7 +1795,7 @@
public SupervisedUserService::Delegate {
public:
ExtensionServiceTestSupervised()
- : field_trial_list_(base::MakeUnique<base::MockEntropyProvider>()) {}
+ : field_trial_list_(std::make_unique<base::MockEntropyProvider>()) {}
void TearDown() override {
supervised_user_service()->SetDelegate(nullptr);
@@ -2501,8 +2501,8 @@
InitializeEmptyExtensionService();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(),
- base::MakeUnique<syncer::FakeSyncChangeProcessor>(),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::FakeSyncChangeProcessor>(),
+ std::make_unique<syncer::SyncErrorFactoryMock>());
extensions::util::SetWasInstalledByCustodian(good2048, profile(), true);
// Install two extensions.
@@ -2716,11 +2716,11 @@
ASSERT_TRUE(registry()->enabled_extensions().GetByID(extension_id_));
{
- auto processor = base::MakeUnique<syncer::FakeSyncChangeProcessor>();
+ auto processor = std::make_unique<syncer::FakeSyncChangeProcessor>();
processor_raw_ = processor.get();
extension_sync_service()->MergeDataAndStartSyncing(
syncer::EXTENSIONS, syncer::SyncDataList(), std::move(processor),
- base::MakeUnique<syncer::SyncErrorFactoryMock>());
+ std::make_unique<syncer::SyncErrorFactoryMock>());
}
processor_raw_->changes().clear();
}
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 3470644..f927121 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -281,7 +281,7 @@
const base::FilePath& path,
Manifest::Location location,
Extension::InitFromValueFlags flags) {
- return base::MakeUnique<ExternalInstallInfoFile>(
+ return std::make_unique<ExternalInstallInfoFile>(
extension_id, base::Version(version_str), path, location, flags, false,
false);
}
@@ -630,7 +630,7 @@
ExtensionServiceTest() = default;
MockExternalProvider* AddMockExternalProvider(Manifest::Location location) {
- auto provider = base::MakeUnique<MockExternalProvider>(service(), location);
+ auto provider = std::make_unique<MockExternalProvider>(service(), location);
MockExternalProvider* provider_ptr = provider.get();
service()->AddProviderForTesting(std::move(provider));
return provider_ptr;
@@ -735,7 +735,7 @@
msg += " = ";
msg += base::IntToString(value);
- SetPref(extension_id, pref_path, base::MakeUnique<base::Value>(value), msg);
+ SetPref(extension_id, pref_path, std::make_unique<base::Value>(value), msg);
}
void SetPrefBool(const std::string& extension_id,
@@ -746,7 +746,7 @@
msg += " = ";
msg += (value ? "true" : "false");
- SetPref(extension_id, pref_path, base::MakeUnique<base::Value>(value), msg);
+ SetPref(extension_id, pref_path, std::make_unique<base::Value>(value), msg);
}
void ClearPref(const std::string& extension_id,
@@ -770,7 +770,7 @@
std::string msg = " while setting: ";
msg += extension_id + " " + pref_path;
- auto list_value = base::MakeUnique<base::ListValue>();
+ auto list_value = std::make_unique<base::ListValue>();
for (std::set<std::string>::const_iterator iter = value.begin();
iter != value.end(); ++iter)
list_value->AppendString(*iter);
@@ -1834,7 +1834,7 @@
// the extension's granted api permissions preference. (This simulates
// updating the browser to a version which recognizes a new API permission).
SetPref(extension_id, "granted_permissions.api",
- base::MakeUnique<base::ListValue>(), "granted_permissions.api");
+ std::make_unique<base::ListValue>(), "granted_permissions.api");
service()->ReloadExtensionsForTest();
EXPECT_EQ(1u, registry()->disabled_extensions().size());
@@ -1869,7 +1869,7 @@
host_permissions.insert("https://*.google.com/*");
host_permissions.insert("http://*.google.com.hk/*");
- auto api_permissions = base::MakeUnique<base::ListValue>();
+ auto api_permissions = std::make_unique<base::ListValue>();
api_permissions->AppendString("tabs");
SetPref(extension_id, "granted_permissions.api", std::move(api_permissions),
"granted_permissions.api");
@@ -4380,7 +4380,7 @@
// enabled, the extension is not disabled.
TEST_F(ExtensionServiceTest, ExternalExtensionIsNotDisabledOnUpdate) {
auto external_prompt_override =
- base::MakeUnique<FeatureSwitch::ScopedOverride>(
+ std::make_unique<FeatureSwitch::ScopedOverride>(
FeatureSwitch::prompt_for_external_extensions(), false);
InitializeEmptyExtensionService();
@@ -4407,7 +4407,7 @@
// before the old is destructed (which will immediately reset to the
// original).
external_prompt_override.reset();
- external_prompt_override = base::MakeUnique<FeatureSwitch::ScopedOverride>(
+ external_prompt_override = std::make_unique<FeatureSwitch::ScopedOverride>(
FeatureSwitch::prompt_for_external_extensions(), true);
WaitForExternalExtensionInstalled();
@@ -7056,7 +7056,7 @@
TEST_F(ExtensionServiceTest,
ExternalInstallBubbleDoesntShowForEnabledExtensions) {
auto external_prompt_override =
- base::MakeUnique<FeatureSwitch::ScopedOverride>(
+ std::make_unique<FeatureSwitch::ScopedOverride>(
FeatureSwitch::prompt_for_external_extensions(), false);
InitializeEmptyExtensionService();
@@ -7080,7 +7080,7 @@
// before the old is destructed (which will immediately reset to the
// original).
external_prompt_override.reset();
- external_prompt_override = base::MakeUnique<FeatureSwitch::ScopedOverride>(
+ external_prompt_override = std::make_unique<FeatureSwitch::ScopedOverride>(
FeatureSwitch::prompt_for_external_extensions(), true);
extensions::ExternalInstallManager* external_manager =
diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc
index d9578a7..4b61172 100644
--- a/chrome/browser/extensions/extension_special_storage_policy.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy.cc
@@ -10,7 +10,6 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/utf_string_conversions.h"
@@ -322,7 +321,7 @@
if (result)
return result.get();
- result = base::MakeUnique<extensions::ExtensionSet>();
+ result = std::make_unique<extensions::ExtensionSet>();
for (auto& extension : extensions_) {
if (extension->OverlapsWithOrigin(origin))
result->Insert(extension);
diff --git a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
index b37c186..b55fbd4 100644
--- a/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
+++ b/chrome/browser/extensions/extension_special_storage_policy_unittest.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "build/build_config.h"
@@ -112,7 +111,7 @@
manifest.SetString(keys::kName, "Protected");
manifest.SetString(keys::kVersion, "1");
manifest.SetString(keys::kLaunchWebURL, "http://explicit/protected/start");
- auto list = base::MakeUnique<base::ListValue>();
+ auto list = std::make_unique<base::ListValue>();
list->AppendString("http://explicit/protected");
list->AppendString("*://*.wildcards/protected");
manifest.Set(keys::kWebURLs, std::move(list));
@@ -134,10 +133,10 @@
manifest.SetString(keys::kName, "Unlimited");
manifest.SetString(keys::kVersion, "1");
manifest.SetString(keys::kLaunchWebURL, "http://explicit/unlimited/start");
- auto list = base::MakeUnique<base::ListValue>();
+ auto list = std::make_unique<base::ListValue>();
list->AppendString("unlimitedStorage");
manifest.Set(keys::kPermissions, std::move(list));
- list = base::MakeUnique<base::ListValue>();
+ list = std::make_unique<base::ListValue>();
list->AppendString("http://explicit/unlimited");
list->AppendString("*://*.wildcards/unlimited");
manifest.Set(keys::kWebURLs, std::move(list));
diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc
index f9731bd..2b4180ed 100644
--- a/chrome/browser/extensions/extension_storage_monitor.cc
+++ b/chrome/browser/extensions/extension_storage_monitor.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_storage_monitor.h"
#include <map>
+#include <memory>
#include <utility>
#include "base/metrics/histogram_macros.h"
@@ -191,7 +192,7 @@
DCHECK(!FindObserver(extension_id));
storage_observers_[extension_id] =
- base::MakeUnique<SingleExtensionStorageObserver>(
+ std::make_unique<SingleExtensionStorageObserver>(
this, extension_id, std::move(quota_manager), site_url.GetOrigin(),
next_threshold, rate, should_uma);
}
@@ -589,7 +590,7 @@
extension_prefs_->UpdateExtensionPref(
extension_id, kPrefNextStorageThreshold,
next_threshold > 0
- ? base::MakeUnique<base::Value>(base::Int64ToString(next_threshold))
+ ? std::make_unique<base::Value>(base::Int64ToString(next_threshold))
: nullptr);
}
@@ -625,7 +626,7 @@
bool enable_notifications) {
extension_prefs_->UpdateExtensionPref(
extension_id, kPrefDisableStorageNotifications,
- enable_notifications ? nullptr : base::MakeUnique<base::Value>(true));
+ enable_notifications ? nullptr : std::make_unique<base::Value>(true));
}
} // namespace extensions
diff --git a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
index c651e28..3bacb19 100644
--- a/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
+++ b/chrome/browser/extensions/extension_storage_monitor_browsertest.cc
@@ -4,6 +4,7 @@
#include <stdint.h>
+#include <memory>
#include <set>
#include <string>
#include <vector>
@@ -133,7 +134,7 @@
const Extension* CreateHostedApp(const std::string& name,
GURL app_url,
std::vector<std::string> permissions) {
- auto dir = base::MakeUnique<TestExtensionDir>();
+ auto dir = std::make_unique<TestExtensionDir>();
url::Replacements<char> clear_port;
clear_port.ClearPort();
diff --git a/chrome/browser/extensions/extension_system_impl.cc b/chrome/browser/extensions/extension_system_impl.cc
index 867bc44b..73e5ad4b 100644
--- a/chrome/browser/extensions/extension_system_impl.cc
+++ b/chrome/browser/extensions/extension_system_impl.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_system_impl.h"
#include <algorithm>
+#include <memory>
#include "base/base_switches.h"
#include "base/bind.h"
@@ -196,7 +197,7 @@
LoadErrorReporter::Init(allow_noisy_errors);
content_verifier_ = new ContentVerifier(
- profile_, base::MakeUnique<ChromeContentVerifierDelegate>(profile_));
+ profile_, std::make_unique<ChromeContentVerifierDelegate>(profile_));
service_worker_manager_.reset(new ServiceWorkerManager(profile_));
diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc
index 35f4c7a..75e8419 100644
--- a/chrome/browser/extensions/extension_tab_util.cc
+++ b/chrome/browser/extensions/extension_tab_util.cc
@@ -374,17 +374,17 @@
if (!tab_strip)
ExtensionTabUtil::GetTabStripModel(contents, &tab_strip, &tab_index);
bool is_loading = contents->IsLoading();
- auto tab_object = base::MakeUnique<api::tabs::Tab>();
- tab_object->id = base::MakeUnique<int>(GetTabIdForExtensions(contents));
+ auto tab_object = std::make_unique<api::tabs::Tab>();
+ tab_object->id = std::make_unique<int>(GetTabIdForExtensions(contents));
tab_object->index = tab_index;
tab_object->window_id = GetWindowIdOfTab(contents);
tab_object->status =
- base::MakeUnique<std::string>(GetTabStatusText(is_loading));
+ std::make_unique<std::string>(GetTabStatusText(is_loading));
tab_object->active = tab_strip && tab_index == tab_strip->active_index();
tab_object->selected = tab_strip && tab_index == tab_strip->active_index();
tab_object->highlighted = tab_strip && tab_strip->IsTabSelected(tab_index);
tab_object->pinned = tab_strip && tab_strip->IsTabPinned(tab_index);
- tab_object->audible = base::MakeUnique<bool>(contents->WasRecentlyAudible());
+ tab_object->audible = std::make_unique<bool>(contents->WasRecentlyAudible());
tab_object->discarded =
g_browser_process->GetTabManager()->IsTabDiscarded(contents);
tab_object->auto_discardable =
@@ -392,22 +392,22 @@
tab_object->muted_info = CreateMutedInfo(contents);
tab_object->incognito = contents->GetBrowserContext()->IsOffTheRecord();
gfx::Size contents_size = contents->GetContainerBounds().size();
- tab_object->width = base::MakeUnique<int>(contents_size.width());
- tab_object->height = base::MakeUnique<int>(contents_size.height());
+ tab_object->width = std::make_unique<int>(contents_size.width());
+ tab_object->height = std::make_unique<int>(contents_size.height());
- tab_object->url = base::MakeUnique<std::string>(contents->GetURL().spec());
+ tab_object->url = std::make_unique<std::string>(contents->GetURL().spec());
tab_object->title =
- base::MakeUnique<std::string>(base::UTF16ToUTF8(contents->GetTitle()));
+ std::make_unique<std::string>(base::UTF16ToUTF8(contents->GetTitle()));
NavigationEntry* entry = contents->GetController().GetVisibleEntry();
if (entry && entry->GetFavicon().valid) {
tab_object->fav_icon_url =
- base::MakeUnique<std::string>(entry->GetFavicon().url.spec());
+ std::make_unique<std::string>(entry->GetFavicon().url.spec());
}
if (tab_strip) {
WebContents* opener = tab_strip->GetOpenerOfWebContentsAt(tab_index);
if (opener) {
tab_object->opener_tab_id =
- base::MakeUnique<int>(GetTabIdForExtensions(opener));
+ std::make_unique<int>(GetTabIdForExtensions(opener));
}
}
diff --git a/chrome/browser/extensions/extension_tab_util_unittest.cc b/chrome/browser/extensions/extension_tab_util_unittest.cc
index dbb1f78..42e5bfd 100644
--- a/chrome/browser/extensions/extension_tab_util_unittest.cc
+++ b/chrome/browser/extensions/extension_tab_util_unittest.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/extension_tab_util.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "chrome/common/extensions/api/tabs.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -36,7 +35,7 @@
// Test that the custom ScrubTabForExtension delegate works - in this test it
// sets URL to a custom string.
TEST(ExtensionTabUtilTest, Delegate) {
- auto test_delegate = base::MakeUnique<ExtensionTabUtilTestDelegate>();
+ auto test_delegate = std::make_unique<ExtensionTabUtilTestDelegate>();
ExtensionTabUtil::SetPlatformDelegate(test_delegate.get());
api::tabs::Tab tab;
diff --git a/chrome/browser/extensions/extension_user_script_loader_unittest.cc b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
index 90137453..602a82a6 100644
--- a/chrome/browser/extensions/extension_user_script_loader_unittest.cc
+++ b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
@@ -6,6 +6,7 @@
#include <stddef.h>
+#include <memory>
#include <set>
#include <string>
@@ -14,7 +15,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/test/base/testing_profile.h"
@@ -219,7 +219,7 @@
ASSERT_EQ(written, content.size());
std::unique_ptr<UserScript> user_script(new UserScript());
- user_script->js_scripts().push_back(base::MakeUnique<UserScript::File>(
+ user_script->js_scripts().push_back(std::make_unique<UserScript::File>(
temp_dir_.GetPath(), path.BaseName(), GURL()));
UserScriptList user_scripts;
@@ -243,7 +243,7 @@
ASSERT_EQ(written, content.size());
std::unique_ptr<UserScript> user_script(new UserScript());
- user_script->js_scripts().push_back(base::MakeUnique<UserScript::File>(
+ user_script->js_scripts().push_back(std::make_unique<UserScript::File>(
temp_dir_.GetPath(), path.BaseName(), GURL()));
UserScriptList user_scripts;
diff --git a/chrome/browser/extensions/extension_util.cc b/chrome/browser/extensions/extension_util.cc
index 7dcaf65..d64e1c5 100644
--- a/chrome/browser/extensions/extension_util.cc
+++ b/chrome/browser/extensions/extension_util.cc
@@ -177,7 +177,7 @@
prefs->UpdateExtensionPref(
extension_id, kWasInstalledByCustodianPrefName,
- installed_by_custodian ? base::MakeUnique<base::Value>(true) : nullptr);
+ installed_by_custodian ? std::make_unique<base::Value>(true) : nullptr);
ExtensionService* service =
ExtensionSystem::Get(context)->extension_service();
diff --git a/chrome/browser/extensions/extension_web_ui.cc b/chrome/browser/extensions/extension_web_ui.cc
index f675ed0..2d7f3a84 100644
--- a/chrome/browser/extensions/extension_web_ui.cc
+++ b/chrome/browser/extensions/extension_web_ui.cc
@@ -11,7 +11,6 @@
#include <vector>
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -121,7 +120,7 @@
}
}
- auto dict = base::MakeUnique<base::DictionaryValue>();
+ auto dict = std::make_unique<base::DictionaryValue>();
dict->SetString(kEntry, spec);
dict->SetBoolean(kActive, true);
// Add the entry to the front of the list.
@@ -490,7 +489,7 @@
base::ListValue* page_overrides_weak = nullptr;
if (!all_overrides->GetList(page_override_pair.first,
&page_overrides_weak)) {
- auto page_overrides = base::MakeUnique<base::ListValue>();
+ auto page_overrides = std::make_unique<base::ListValue>();
page_overrides_weak = page_overrides.get();
all_overrides->Set(page_override_pair.first, std::move(page_overrides));
}
diff --git a/chrome/browser/extensions/extension_web_ui_unittest.cc b/chrome/browser/extensions/extension_web_ui_unittest.cc
index 88c812a7..59b94835 100644
--- a/chrome/browser/extensions/extension_web_ui_unittest.cc
+++ b/chrome/browser/extensions/extension_web_ui_unittest.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/extensions/extension_web_ui.h"
#include "base/command_line.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -31,7 +30,7 @@
std::unique_ptr<KeyedService> BuildOverrideRegistrar(
content::BrowserContext* context) {
- return base::MakeUnique<ExtensionWebUIOverrideRegistrar>(context);
+ return std::make_unique<ExtensionWebUIOverrideRegistrar>(context);
}
} // namespace
diff --git a/chrome/browser/extensions/external_install_error_browsertest.cc b/chrome/browser/extensions/external_install_error_browsertest.cc
index a22e583..913970a 100644
--- a/chrome/browser/extensions/external_install_error_browsertest.cc
+++ b/chrome/browser/extensions/external_install_error_browsertest.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/external_install_error.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -36,7 +35,7 @@
content::WindowedNotificationObserver install_observer(
NOTIFICATION_CRX_INSTALLER_DONE,
content::NotificationService::AllSources());
- auto provider = base::MakeUnique<MockExternalProvider>(
+ auto provider = std::make_unique<MockExternalProvider>(
extension_service(), Manifest::EXTERNAL_PREF);
provider->UpdateOrAddExtension(kId, "1.0.0.0",
test_data_dir_.AppendASCII("good.crx"));
diff --git a/chrome/browser/extensions/external_pref_loader.cc b/chrome/browser/extensions/external_pref_loader.cc
index 3304559..53e9c07 100644
--- a/chrome/browser/extensions/external_pref_loader.cc
+++ b/chrome/browser/extensions/external_pref_loader.cc
@@ -13,7 +13,6 @@
#include "base/json/json_file_value_serializer.h"
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/path_service.h"
#include "base/scoped_observer.h"
@@ -221,7 +220,7 @@
if (!extensions) {
LOG(WARNING) << "Unable to deserialize json data: " << error_msg
<< " in file " << path.value() << ".";
- return base::MakeUnique<base::DictionaryValue>();
+ return std::make_unique<base::DictionaryValue>();
}
std::unique_ptr<base::DictionaryValue> ext_dictionary =
@@ -230,13 +229,13 @@
return ext_dictionary;
LOG(WARNING) << "Expected a JSON dictionary in file " << path.value() << ".";
- return base::MakeUnique<base::DictionaryValue>();
+ return std::make_unique<base::DictionaryValue>();
}
void ExternalPrefLoader::LoadOnFileThread() {
base::AssertBlockingAllowed();
- auto prefs = base::MakeUnique<base::DictionaryValue>();
+ auto prefs = std::make_unique<base::DictionaryValue>();
// TODO(skerner): Some values of base_path_id_ will cause
// PathService::Get() to return false, because the path does
diff --git a/chrome/browser/extensions/external_provider_impl.cc b/chrome/browser/extensions/external_provider_impl.cc
index b85516c2..db07f7a5 100644
--- a/chrome/browser/extensions/external_provider_impl.cc
+++ b/chrome/browser/extensions/external_provider_impl.cc
@@ -14,7 +14,6 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/field_trial.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
@@ -530,7 +529,7 @@
external_loader = new ExternalPolicyLoader(
ExtensionManagementFactory::GetForBrowserContext(profile),
ExternalPolicyLoader::FORCED);
- auto signin_profile_provider = base::MakeUnique<ExternalProviderImpl>(
+ auto signin_profile_provider = std::make_unique<ExternalProviderImpl>(
service, external_loader, profile, crx_location,
Manifest::EXTERNAL_POLICY_DOWNLOAD,
Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT);
@@ -578,7 +577,7 @@
// Policies are mandatory so they can't be skipped with command line flag.
if (external_loader.get()) {
- auto policy_provider = base::MakeUnique<ExternalProviderImpl>(
+ auto policy_provider = std::make_unique<ExternalProviderImpl>(
service, external_loader, profile, crx_location,
Manifest::EXTERNAL_POLICY_DOWNLOAD, Extension::NO_FLAGS);
policy_provider->set_allow_updates(true);
@@ -627,7 +626,7 @@
// Extensions provided by recommended policies.
if (external_recommended_loader.get()) {
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service, external_recommended_loader, profile, crx_location,
Manifest::EXTERNAL_PREF_DOWNLOAD, Extension::NO_FLAGS));
}
@@ -672,7 +671,7 @@
? ExternalPrefLoader::DELAY_LOAD_UNTIL_PRIORITY_SYNC
: ExternalPrefLoader::NONE;
for (const auto external_apps_path_id : external_apps_path_ids) {
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
new ExternalPrefLoader(external_apps_path_id, pref_load_flags,
profile),
@@ -685,14 +684,14 @@
bundled_extension_creation_flags | Extension::WAS_INSTALLED_BY_OEM;
chromeos::ServicesCustomizationDocument* customization =
chromeos::ServicesCustomizationDocument::GetInstance();
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service, customization->CreateExternalLoader(profile), profile,
Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
oem_extension_creation_flags));
}
#elif defined(OS_LINUX)
if (!profile->IsLegacySupervised()) {
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
new ExternalPrefLoader(chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS,
ExternalPrefLoader::NONE, nullptr),
@@ -703,14 +702,14 @@
if (!profile->IsLegacySupervised()) {
#if defined(OS_WIN)
- auto registry_provider = base::MakeUnique<ExternalProviderImpl>(
+ auto registry_provider = std::make_unique<ExternalProviderImpl>(
service, new ExternalRegistryLoader, profile,
Manifest::EXTERNAL_REGISTRY, Manifest::EXTERNAL_PREF_DOWNLOAD,
Extension::NO_FLAGS);
registry_provider->set_allow_updates(true);
provider_list->push_back(std::move(registry_provider));
#else
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
new ExternalPrefLoader(chrome::DIR_EXTERNAL_EXTENSIONS,
check_admin_permissions_on_mac, nullptr),
@@ -719,9 +718,10 @@
// Define a per-user source of external extensions.
#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD))
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
- service, new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
- ExternalPrefLoader::NONE, nullptr),
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
+ service,
+ new ExternalPrefLoader(chrome::DIR_USER_EXTERNAL_EXTENSIONS,
+ ExternalPrefLoader::NONE, nullptr),
profile, Manifest::EXTERNAL_PREF, Manifest::EXTERNAL_PREF_DOWNLOAD,
Extension::NO_FLAGS));
#endif
@@ -730,7 +730,7 @@
#if !defined(OS_CHROMEOS)
// The default apps are installed as INTERNAL but use the external
// extension installer codeflow.
- provider_list->push_back(base::MakeUnique<default_apps::Provider>(
+ provider_list->push_back(std::make_unique<default_apps::Provider>(
profile, service,
new ExternalPrefLoader(chrome::DIR_DEFAULT_APPS,
ExternalPrefLoader::NONE, nullptr),
@@ -749,7 +749,7 @@
provider_list->push_back(std::move(drive_migration_provider));
}
- provider_list->push_back(base::MakeUnique<ExternalProviderImpl>(
+ provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service, new ExternalComponentLoader(profile), profile,
Manifest::INVALID_LOCATION, Manifest::EXTERNAL_COMPONENT,
Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT));
diff --git a/chrome/browser/extensions/external_registry_loader_win.cc b/chrome/browser/extensions/external_registry_loader_win.cc
index 3006f9e..44b0a40 100644
--- a/chrome/browser/extensions/external_registry_loader_win.cc
+++ b/chrome/browser/extensions/external_registry_loader_win.cc
@@ -4,11 +4,12 @@
#include "chrome/browser/extensions/external_registry_loader_win.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "base/files/scoped_file.h"
-#include "base/memory/ptr_util.h"
#include "base/metrics/histogram_macros.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
@@ -77,7 +78,7 @@
std::unique_ptr<base::DictionaryValue>
ExternalRegistryLoader::LoadPrefsOnBlockingThread() {
base::AssertBlockingAllowed();
- auto prefs = base::MakeUnique<base::DictionaryValue>();
+ auto prefs = std::make_unique<base::DictionaryValue>();
// A map of IDs, to weed out duplicates between HKCU and HKLM.
std::set<base::string16> keys;
diff --git a/chrome/browser/extensions/install_signer.cc b/chrome/browser/extensions/install_signer.cc
index 2d4805a0..7527ef08 100644
--- a/chrome/browser/extensions/install_signer.cc
+++ b/chrome/browser/extensions/install_signer.cc
@@ -15,7 +15,6 @@
#include "base/json/json_writer.h"
#include "base/lazy_instance.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram_macros.h"
#include "base/process/process_info.h"
@@ -127,7 +126,7 @@
void SetExtensionIdSet(base::DictionaryValue* dictionary,
const char* key,
const ExtensionIdSet& ids) {
- auto id_list = base::MakeUnique<base::ListValue>();
+ auto id_list = std::make_unique<base::ListValue>();
for (ExtensionIdSet::const_iterator i = ids.begin(); i != ids.end(); ++i)
id_list->AppendString(*i);
dictionary->Set(key, std::move(id_list));
diff --git a/chrome/browser/extensions/launch_util.cc b/chrome/browser/extensions/launch_util.cc
index 024624e..87a443d 100644
--- a/chrome/browser/extensions/launch_util.cc
+++ b/chrome/browser/extensions/launch_util.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/launch_util.h"
+#include <memory>
+
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/browser/extensions/extension_sync_service.h"
@@ -83,7 +85,7 @@
ExtensionPrefs::Get(context)->UpdateExtensionPref(
extension_id, kPrefLaunchType,
- base::MakeUnique<base::Value>(static_cast<int>(launch_type)));
+ std::make_unique<base::Value>(static_cast<int>(launch_type)));
// Sync the launch type.
const Extension* extension =
diff --git a/chrome/browser/extensions/menu_manager.cc b/chrome/browser/extensions/menu_manager.cc
index 0a94038..86dd4a5 100644
--- a/chrome/browser/extensions/menu_manager.cc
+++ b/chrome/browser/extensions/menu_manager.cc
@@ -11,7 +11,6 @@
#include "base/json/json_writer.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
@@ -263,7 +262,7 @@
if (!contexts.Populate(*contexts_value))
return nullptr;
- std::unique_ptr<MenuItem> result = base::MakeUnique<MenuItem>(
+ std::unique_ptr<MenuItem> result = std::make_unique<MenuItem>(
id, title, checked, visible, enabled, type, contexts);
std::vector<std::string> document_url_patterns;
@@ -282,7 +281,7 @@
// parent_id is filled in from the value, but it might not be valid. It's left
// to be validated upon being added (via AddChildItem) to the menu manager.
std::unique_ptr<Id> parent_id =
- base::MakeUnique<Id>(incognito, MenuItem::ExtensionKey(extension_id));
+ std::make_unique<Id>(incognito, MenuItem::ExtensionKey(extension_id));
if (value.HasKey(kParentUIDKey)) {
if (!value.GetString(kParentUIDKey, &parent_id->string_uid))
return nullptr;
@@ -674,7 +673,7 @@
webview_guest->view_instance_id());
}
- auto args = base::MakeUnique<base::ListValue>();
+ auto args = std::make_unique<base::ListValue>();
args->Reserve(2);
args->Append(std::move(properties));
// |properties| is invalidated at this time, which is why |args| needs to be
@@ -694,7 +693,7 @@
args->Append(ExtensionTabUtil::CreateTabObject(web_contents)->ToValue());
} else {
- args->Append(base::MakeUnique<base::DictionaryValue>());
+ args->Append(std::make_unique<base::DictionaryValue>());
}
}
@@ -725,7 +724,7 @@
{
// Dispatch to menu item's .onclick handler (this is the legacy API, from
// before chrome.contextMenus.onClicked existed).
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
webview_guest ? events::WEB_VIEW_INTERNAL_CONTEXT_MENUS
: events::CONTEXT_MENUS,
webview_guest ? kOnWebviewContextMenus : kOnContextMenus,
@@ -736,7 +735,7 @@
}
{
// Dispatch to .contextMenus.onClicked handler.
- auto event = base::MakeUnique<Event>(
+ auto event = std::make_unique<Event>(
webview_guest ? events::CHROME_WEB_VIEW_INTERNAL_ON_CLICKED
: events::CONTEXT_MENUS_ON_CLICKED,
webview_guest ? api::chrome_web_view_internal::OnClicked::kEventName
diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc
index 434762c..4f8083a 100644
--- a/chrome/browser/extensions/menu_manager_unittest.cc
+++ b/chrome/browser/extensions/menu_manager_unittest.cc
@@ -11,7 +11,6 @@
#include "base/files/scoped_temp_dir.h"
#include "base/json/json_reader.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_task_runner_handle.h"
@@ -70,7 +69,7 @@
const MenuItem::ExtensionKey key(extension->id());
MenuItem::Id id(incognito, key);
id.uid = next_id_++;
- return base::MakeUnique<MenuItem>(id, "test", false, true, true, type,
+ return std::make_unique<MenuItem>(id, "test", false, true, true, type,
contexts);
}
@@ -82,7 +81,7 @@
const MenuItem::ExtensionKey key(extension->id());
MenuItem::Id id(false, key);
id.string_uid = string_id;
- return base::MakeUnique<MenuItem>(id, "test", false, true, true, type,
+ return std::make_unique<MenuItem>(id, "test", false, true, true, type,
contexts);
}
@@ -235,11 +234,11 @@
int contexts_value = 0;
ASSERT_TRUE(contexts.ToValue()->GetAsInteger(&contexts_value));
- auto document_url_patterns = base::MakeUnique<base::ListValue>();
+ auto document_url_patterns = std::make_unique<base::ListValue>();
document_url_patterns->AppendString("http://www.google.com/*");
document_url_patterns->AppendString("http://www.reddit.com/*");
- auto target_url_patterns = base::MakeUnique<base::ListValue>();
+ auto target_url_patterns = std::make_unique<base::ListValue>();
target_url_patterns->AppendString("http://www.yahoo.com/*");
target_url_patterns->AppendString("http://www.facebook.com/*");
@@ -505,7 +504,7 @@
// MockEventRouter factory function
std::unique_ptr<KeyedService> MockEventRouterFactoryFunction(
content::BrowserContext* context) {
- return base::MakeUnique<MockEventRouter>(static_cast<Profile*>(context));
+ return std::make_unique<MockEventRouter>(static_cast<Profile*>(context));
}
} // namespace
diff --git a/chrome/browser/extensions/navigation_observer.cc b/chrome/browser/extensions/navigation_observer.cc
index aafe561..1ca88a7 100644
--- a/chrome/browser/extensions/navigation_observer.cc
+++ b/chrome/browser/extensions/navigation_observer.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/navigation_observer.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/navigation_controller.h"
@@ -112,7 +111,7 @@
base::Bind(&NavigationObserver::OnInstallPromptDone,
weak_factory_.GetWeakPtr()),
extension, nullptr,
- base::MakeUnique<ExtensionInstallPrompt::Prompt>(type),
+ std::make_unique<ExtensionInstallPrompt::Prompt>(type),
ExtensionInstallPrompt::GetDefaultShowDialogCallback());
}
}
diff --git a/chrome/browser/extensions/ntp_overridden_bubble_delegate.cc b/chrome/browser/extensions/ntp_overridden_bubble_delegate.cc
index df65314d..034c89a 100644
--- a/chrome/browser/extensions/ntp_overridden_bubble_delegate.cc
+++ b/chrome/browser/extensions/ntp_overridden_bubble_delegate.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h"
+#include <memory>
+
#include "base/feature_list.h"
#include "base/metrics/histogram_macros.h"
#include "chrome/browser/extensions/extension_service.h"
@@ -79,7 +81,7 @@
URLOverrides::GetChromeURLOverrides(extension.get());
if (overrides.find(chrome::kChromeUINewTabHost) != overrides.end()) {
prefs->UpdateExtensionPref(extension->id(), kNtpBubbleAcknowledged,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
}
}
}
diff --git a/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc b/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc
index 00bb446..65624e8 100644
--- a/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc
+++ b/chrome/browser/extensions/ntp_overridden_bubble_delegate_unittest.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/ntp_overridden_bubble_delegate.h"
+#include <memory>
+
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_service_test_base.h"
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
@@ -19,7 +21,7 @@
std::unique_ptr<KeyedService> BuildOverrideRegistrar(
content::BrowserContext* context) {
- return base::MakeUnique<ExtensionWebUIOverrideRegistrar>(context);
+ return std::make_unique<ExtensionWebUIOverrideRegistrar>(context);
}
scoped_refptr<const Extension> GetNtpExtension(const std::string& name) {
@@ -57,7 +59,7 @@
auto include_extension = [this](const Extension* extension) {
auto ntp_delegate =
- base::MakeUnique<NtpOverriddenBubbleDelegate>(profile());
+ std::make_unique<NtpOverriddenBubbleDelegate>(profile());
return ntp_delegate->ShouldIncludeExtension(extension);
};
// By default, we should warn about an extension overriding the NTP.
diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc
index e848f88f..79c4a65 100644
--- a/chrome/browser/extensions/pack_extension_job.cc
+++ b/chrome/browser/extensions/pack_extension_job.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/extensions/pack_extension_job.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/sys_string_conversions.h"
@@ -51,10 +53,10 @@
scoped_refptr<base::SequencedTaskRunner> async_reply_task_runner) {
DCHECK_EQ(!!async_reply_task_runner, run_mode_ == RunMode::ASYNCHRONOUS)
<< "Provide task runner iff we are running in asynchronous mode.";
- auto crx_file_out = base::MakeUnique<base::FilePath>(
+ auto crx_file_out = std::make_unique<base::FilePath>(
root_directory_.AddExtension(kExtensionFileExtension));
- auto key_file_out = base::MakeUnique<base::FilePath>();
+ auto key_file_out = std::make_unique<base::FilePath>();
if (key_file_.empty())
*key_file_out = root_directory_.AddExtension(kExtensionKeyFileExtension);
diff --git a/chrome/browser/extensions/permissions_updater.cc b/chrome/browser/extensions/permissions_updater.cc
index bbcf2f3..e77fd4a 100644
--- a/chrome/browser/extensions/permissions_updater.cc
+++ b/chrome/browser/extensions/permissions_updater.cc
@@ -292,7 +292,7 @@
std::unique_ptr<api::permissions::Permissions> permissions =
PackPermissionSet(changed_permissions);
value->Append(permissions->ToValue());
- auto event = base::MakeUnique<Event>(histogram_value, event_name,
+ auto event = std::make_unique<Event>(histogram_value, event_name,
std::move(value), browser_context_);
event_router->DispatchEventToExtension(extension_id, std::move(event));
}
diff --git a/chrome/browser/extensions/permissions_updater_unittest.cc b/chrome/browser/extensions/permissions_updater_unittest.cc
index 9dc6048b..f42ae0b2 100644
--- a/chrome/browser/extensions/permissions_updater_unittest.cc
+++ b/chrome/browser/extensions/permissions_updater_unittest.cc
@@ -8,7 +8,6 @@
#include "base/files/file_path.h"
#include "base/json/json_file_value_serializer.h"
-#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/run_loop.h"
#include "base/values.h"
@@ -259,7 +258,7 @@
auto api_permission_set = [](APIPermission::ID id) {
APIPermissionSet apis;
apis.insert(id);
- return base::MakeUnique<PermissionSet>(apis, ManifestPermissionSet(),
+ return std::make_unique<PermissionSet>(apis, ManifestPermissionSet(),
URLPatternSet(), URLPatternSet());
};
@@ -267,7 +266,7 @@
URLPatternSet set;
URLPattern pattern(URLPattern::SCHEME_ALL, url.spec());
set.AddPattern(pattern);
- return base::MakeUnique<PermissionSet>(
+ return std::make_unique<PermissionSet>(
APIPermissionSet(), ManifestPermissionSet(), set, URLPatternSet());
};
@@ -499,11 +498,10 @@
required_permissions.Append("tabs").Append("management").Append("cookies");
scoped_refptr<const Extension> extension =
CreateExtensionWithOptionalPermissions(
- base::MakeUnique<base::ListValue>(),
- required_permissions.Build(),
+ std::make_unique<base::ListValue>(), required_permissions.Build(),
"My Extension");
- auto test_delegate = base::MakeUnique<PermissionsUpdaterTestDelegate>();
+ auto test_delegate = std::make_unique<PermissionsUpdaterTestDelegate>();
PermissionsUpdater::SetPlatformDelegate(test_delegate.get());
PermissionsUpdater updater(profile());
updater.InitializePermissions(extension.get());
diff --git a/chrome/browser/extensions/scripting_permissions_modifier.cc b/chrome/browser/extensions/scripting_permissions_modifier.cc
index 288dd2f..11556e3 100644
--- a/chrome/browser/extensions/scripting_permissions_modifier.cc
+++ b/chrome/browser/extensions/scripting_permissions_modifier.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/scripting_permissions_modifier.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/extension_sync_service.h"
#include "chrome/browser/extensions/permissions_updater.h"
#include "extensions/browser/extension_prefs.h"
@@ -59,10 +58,10 @@
const std::string& id,
ExtensionPrefs* prefs) {
prefs->UpdateExtensionPref(id, kExtensionAllowedOnAllUrlsPrefName,
- base::MakeUnique<base::Value>(allowed));
+ std::make_unique<base::Value>(allowed));
if (by_user) {
prefs->UpdateExtensionPref(id, kHasSetScriptOnAllUrlsPrefName,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
}
}
@@ -310,7 +309,7 @@
DCHECK(ExtensionMustBeAllowedOnAllUrls(*extension_));
extension_prefs_->UpdateExtensionPref(extension_->id(),
kExtensionAllowedOnAllUrlsPrefName,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
extension_prefs_->UpdateExtensionPref(
extension_->id(), kHasSetScriptOnAllUrlsPrefName, nullptr);
}
diff --git a/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc b/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
index 18d5db7..08c1508 100644
--- a/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
+++ b/chrome/browser/extensions/scripting_permissions_modifier_unittest.cc
@@ -357,9 +357,9 @@
const char* kHasSetPref = "has_set_script_all_urls";
ExtensionPrefs* prefs = ExtensionPrefs::Get(profile());
prefs->UpdateExtensionPref(extension->id(), kAllowedPref,
- base::MakeUnique<base::Value>(false));
+ std::make_unique<base::Value>(false));
prefs->UpdateExtensionPref(extension->id(), kHasSetPref,
- base::MakeUnique<base::Value>(true));
+ std::make_unique<base::Value>(true));
// The modifier should still return the correct value and should fix the
// preferences.
diff --git a/chrome/browser/extensions/tab_helper.cc b/chrome/browser/extensions/tab_helper.cc
index a785581..1dbcebe 100644
--- a/chrome/browser/extensions/tab_helper.cc
+++ b/chrome/browser/extensions/tab_helper.cc
@@ -6,7 +6,6 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
@@ -442,7 +441,7 @@
if (observe_install_stage || observe_download_progress) {
DCHECK_EQ(0u, install_observers_.count(webstore_item_id));
install_observers_[webstore_item_id] =
- base::MakeUnique<InlineInstallObserver>(
+ std::make_unique<InlineInstallObserver>(
this, web_contents()->GetBrowserContext(), webstore_item_id,
observe_download_progress, observe_install_stage);
}
diff --git a/chrome/browser/extensions/unpacked_installer.cc b/chrome/browser/extensions/unpacked_installer.cc
index 87d9dd2..395d982 100644
--- a/chrome/browser/extensions/unpacked_installer.cc
+++ b/chrome/browser/extensions/unpacked_installer.cc
@@ -8,7 +8,6 @@
#include "base/callback.h"
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.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"
@@ -186,10 +185,10 @@
}
}
- policy_check_ = base::MakeUnique<PolicyCheck>(profile_, extension_);
- requirements_check_ = base::MakeUnique<RequirementsChecker>(extension_);
+ policy_check_ = std::make_unique<PolicyCheck>(profile_, extension_);
+ requirements_check_ = std::make_unique<RequirementsChecker>(extension_);
- check_group_ = base::MakeUnique<PreloadCheckGroup>();
+ check_group_ = std::make_unique<PreloadCheckGroup>();
check_group_->set_stop_on_first_error(true);
check_group_->AddCheck(policy_check_.get());
diff --git a/chrome/browser/extensions/update_install_gate_unittest.cc b/chrome/browser/extensions/update_install_gate_unittest.cc
index afc26475..e899838 100644
--- a/chrome/browser/extensions/update_install_gate_unittest.cc
+++ b/chrome/browser/extensions/update_install_gate_unittest.cc
@@ -43,7 +43,7 @@
std::unique_ptr<KeyedService> BuildEventRouter(
content::BrowserContext* profile) {
- return base::MakeUnique<extensions::EventRouter>(profile, nullptr);
+ return std::make_unique<extensions::EventRouter>(profile, nullptr);
}
scoped_refptr<Extension> CreateApp(const std::string& extension_id,
diff --git a/chrome/browser/extensions/user_script_listener_unittest.cc b/chrome/browser/extensions/user_script_listener_unittest.cc
index 4ae6338..7358e3d 100644
--- a/chrome/browser/extensions/user_script_listener_unittest.cc
+++ b/chrome/browser/extensions/user_script_listener_unittest.cc
@@ -10,7 +10,6 @@
#include "base/files/file_util.h"
#include "base/json/json_file_value_serializer.h"
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
#include "base/threading/thread.h"
#include "chrome/browser/chrome_notification_types.h"
@@ -185,7 +184,7 @@
bool defer = false;
if (throttle) {
- request->SetUserData(kUserDataKey, base::MakeUnique<ThrottleDelegate>(
+ request->SetUserData(kUserDataKey, std::make_unique<ThrottleDelegate>(
request.get(), throttle));
throttle->WillStartRequest(&defer);
@@ -355,7 +354,7 @@
ResourceThrottle* throttle =
listener_->CreateResourceThrottle(url, content::RESOURCE_TYPE_MAIN_FRAME);
ASSERT_TRUE(throttle);
- request->SetUserData(kUserDataKey, base::MakeUnique<ThrottleDelegate>(
+ request->SetUserData(kUserDataKey, std::make_unique<ThrottleDelegate>(
request.get(), throttle));
ASSERT_FALSE(request->is_pending());
diff --git a/chrome/browser/extensions/warning_badge_service.cc b/chrome/browser/extensions/warning_badge_service.cc
index 749aee9..5ac2f26 100644
--- a/chrome/browser/extensions/warning_badge_service.cc
+++ b/chrome/browser/extensions/warning_badge_service.cc
@@ -6,8 +6,9 @@
#include <stddef.h>
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/extensions/warning_badge_service_factory.h"
@@ -160,7 +161,7 @@
if (error && !show)
service->RemoveGlobalError(error);
else if (!error && show)
- service->AddGlobalError(base::MakeUnique<ErrorBadge>(this));
+ service->AddGlobalError(std::make_unique<ErrorBadge>(this));
}
} // namespace extensions
diff --git a/chrome/browser/extensions/webstore_inline_installer.cc b/chrome/browser/extensions/webstore_inline_installer.cc
index 6816f21..ee4e890a8 100644
--- a/chrome/browser/extensions/webstore_inline_installer.cc
+++ b/chrome/browser/extensions/webstore_inline_installer.cc
@@ -129,7 +129,7 @@
if (!profile()->GetPrefs()->GetBoolean(prefs::kSafeBrowsingEnabled))
return std::string();
- auto redirect_chain = base::MakeUnique<base::ListValue>();
+ auto redirect_chain = std::make_unique<base::ListValue>();
if (SafeBrowsingNavigationEventsEnabled()) {
// If we have it, use the new referrer checker.
diff --git a/chrome/browser/extensions/webstore_inline_installer_unittest.cc b/chrome/browser/extensions/webstore_inline_installer_unittest.cc
index c4262e6..89143ed 100644
--- a/chrome/browser/extensions/webstore_inline_installer_unittest.cc
+++ b/chrome/browser/extensions/webstore_inline_installer_unittest.cc
@@ -5,7 +5,6 @@
#include <utility>
#include <vector>
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/webstore_inline_installer.h"
#include "chrome/common/extensions/webstore_install_result.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
@@ -97,7 +96,7 @@
bool WebstoreInlineInstallerTest::TestMultipleVerifiedSites(
const std::string& requestor_url,
const std::vector<std::string>& verified_sites) {
- auto sites = base::MakeUnique<base::ListValue>();
+ auto sites = std::make_unique<base::ListValue>();
for (std::vector<std::string>::const_iterator it = verified_sites.begin();
it != verified_sites.end(); ++it) {
sites->AppendString(*it);
diff --git a/chrome/browser/extensions/webstore_install_with_prompt.cc b/chrome/browser/extensions/webstore_install_with_prompt.cc
index 86fd563..aab742f 100644
--- a/chrome/browser/extensions/webstore_install_with_prompt.cc
+++ b/chrome/browser/extensions/webstore_install_with_prompt.cc
@@ -4,7 +4,6 @@
#include "chrome/browser/extensions/webstore_install_with_prompt.h"
-#include "base/memory/ptr_util.h"
#include "chrome/browser/extensions/webstore_installer.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/web_contents.h"
@@ -57,7 +56,7 @@
std::unique_ptr<ExtensionInstallPrompt::Prompt>
WebstoreInstallWithPrompt::CreateInstallPrompt() const {
- return base::MakeUnique<ExtensionInstallPrompt::Prompt>(
+ return std::make_unique<ExtensionInstallPrompt::Prompt>(
ExtensionInstallPrompt::INSTALL_PROMPT);
}
@@ -65,7 +64,7 @@
WebstoreInstallWithPrompt::CreateInstallUI() {
// Create an ExtensionInstallPrompt. If the parent window is NULL, the dialog
// will be placed in the middle of the screen.
- return base::MakeUnique<ExtensionInstallPrompt>(profile(), parent_window_);
+ return std::make_unique<ExtensionInstallPrompt>(profile(), parent_window_);
}
bool WebstoreInstallWithPrompt::ShouldShowPostInstallUI() const {
diff --git a/chrome/browser/extensions/webstore_standalone_installer.cc b/chrome/browser/extensions/webstore_standalone_installer.cc
index cc15d80..d7e83ec 100644
--- a/chrome/browser/extensions/webstore_standalone_installer.cc
+++ b/chrome/browser/extensions/webstore_standalone_installer.cc
@@ -6,7 +6,6 @@
#include <utility>
-#include "base/memory/ptr_util.h"
#include "base/values.h"
#include "base/version.h"
#include "chrome/browser/extensions/crx_installer.h"
@@ -168,7 +167,7 @@
std::unique_ptr<ExtensionInstallPrompt>
WebstoreStandaloneInstaller::CreateInstallUI() {
- return base::MakeUnique<ExtensionInstallPrompt>(GetWebContents());
+ return std::make_unique<ExtensionInstallPrompt>(GetWebContents());
}
std::unique_ptr<WebstoreInstaller::Approval>
diff --git a/chrome/browser/extensions/webstore_startup_installer.cc b/chrome/browser/extensions/webstore_startup_installer.cc
index 691f924..010821a 100644
--- a/chrome/browser/extensions/webstore_startup_installer.cc
+++ b/chrome/browser/extensions/webstore_startup_installer.cc
@@ -4,7 +4,7 @@
#include "chrome/browser/extensions/webstore_startup_installer.h"
-#include "base/memory/ptr_util.h"
+#include <memory>
namespace extensions {
@@ -24,7 +24,7 @@
std::unique_ptr<ExtensionInstallPrompt::Prompt>
WebstoreStartupInstaller::CreateInstallPrompt() const {
if (show_prompt_) {
- return base::MakeUnique<ExtensionInstallPrompt::Prompt>(
+ return std::make_unique<ExtensionInstallPrompt::Prompt>(
ExtensionInstallPrompt::INSTALL_PROMPT);
}
return NULL;
diff --git a/chrome/browser/extensions/zipfile_installer.cc b/chrome/browser/extensions/zipfile_installer.cc
index 0239005..713bccd 100644
--- a/chrome/browser/extensions/zipfile_installer.cc
+++ b/chrome/browser/extensions/zipfile_installer.cc
@@ -78,7 +78,7 @@
}
DCHECK(!utility_process_mojo_client_);
- utility_process_mojo_client_ = base::MakeUnique<
+ utility_process_mojo_client_ = std::make_unique<
content::UtilityProcessMojoClient<mojom::ExtensionUnpacker>>(
l10n_util::GetStringUTF16(IDS_UTILITY_PROCESS_ZIP_FILE_INSTALLER_NAME));
utility_process_mojo_client_->set_error_callback(
