Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1364)

Unified Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_ui.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/website_settings/website_settings_unittest.cc
diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc
index 09aa64f3d7d888ccabfad421f8242a8a9cb9551b..ea0e4af93217cecca4bf05d12b0549e526d9dcfb 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -8,6 +8,7 @@
#include <vector>
#include "base/at_exit.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
@@ -153,7 +154,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
last_chosen_object_info_.clear();
for (WebsiteSettingsUI::ChosenObjectInfo* chosen_object_info :
chosen_object_info_list)
- last_chosen_object_info_.push_back(make_scoped_ptr(chosen_object_info));
+ last_chosen_object_info_.push_back(base::WrapUnique(chosen_object_info));
}
const GURL& url() const { return url_; }
@@ -163,7 +164,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
const SecurityStateModel::SecurityInfo& security_info() {
return security_info_;
}
- const std::vector<scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo>>&
+ const std::vector<std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>>&
last_chosen_object_info() {
return last_chosen_object_info_;
}
@@ -189,13 +190,13 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
private:
TestDeviceClient device_client_;
- scoped_ptr<WebsiteSettings> website_settings_;
- scoped_ptr<MockWebsiteSettingsUI> mock_ui_;
+ std::unique_ptr<WebsiteSettings> website_settings_;
+ std::unique_ptr<MockWebsiteSettingsUI> mock_ui_;
int cert_id_;
scoped_refptr<net::X509Certificate> cert_;
MockCertStore cert_store_;
GURL url_;
- std::vector<scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo>>
+ std::vector<std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>>
last_chosen_object_info_;
};
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings_ui.cc ('k') | chrome/browser/ui/webui/about_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698