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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/website_settings/website_settings.h" 5 #include "chrome/browser/ui/website_settings/website_settings.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/at_exit.h" 10 #include "base/at_exit.h"
11 #include "base/memory/ptr_util.h"
11 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
12 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
13 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "chrome/browser/content_settings/host_content_settings_map_factory.h" 16 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
16 #include "chrome/browser/infobars/infobar_service.h" 17 #include "chrome/browser/infobars/infobar_service.h"
17 #include "chrome/browser/ui/website_settings/website_settings_ui.h" 18 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
18 #include "chrome/browser/usb/usb_chooser_context.h" 19 #include "chrome/browser/usb/usb_chooser_context.h"
19 #include "chrome/browser/usb/usb_chooser_context_factory.h" 20 #include "chrome/browser/usb/usb_chooser_context_factory.h"
20 #include "chrome/test/base/chrome_render_view_host_test_harness.h" 21 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 EXPECT_CALL(*mock_ui, SetCookieInfo(_)); 147 EXPECT_CALL(*mock_ui, SetCookieInfo(_));
147 } 148 }
148 149
149 void SetURL(const std::string& url) { url_ = GURL(url); } 150 void SetURL(const std::string& url) { url_ = GURL(url); }
150 151
151 void SetPermissionInfo(const PermissionInfoList& permission_info_list, 152 void SetPermissionInfo(const PermissionInfoList& permission_info_list,
152 const ChosenObjectInfoList& chosen_object_info_list) { 153 const ChosenObjectInfoList& chosen_object_info_list) {
153 last_chosen_object_info_.clear(); 154 last_chosen_object_info_.clear();
154 for (WebsiteSettingsUI::ChosenObjectInfo* chosen_object_info : 155 for (WebsiteSettingsUI::ChosenObjectInfo* chosen_object_info :
155 chosen_object_info_list) 156 chosen_object_info_list)
156 last_chosen_object_info_.push_back(make_scoped_ptr(chosen_object_info)); 157 last_chosen_object_info_.push_back(base::WrapUnique(chosen_object_info));
157 } 158 }
158 159
159 const GURL& url() const { return url_; } 160 const GURL& url() const { return url_; }
160 MockCertStore* cert_store() { return &cert_store_; } 161 MockCertStore* cert_store() { return &cert_store_; }
161 int cert_id() { return cert_id_; } 162 int cert_id() { return cert_id_; }
162 MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); } 163 MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); }
163 const SecurityStateModel::SecurityInfo& security_info() { 164 const SecurityStateModel::SecurityInfo& security_info() {
164 return security_info_; 165 return security_info_;
165 } 166 }
166 const std::vector<scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo>>& 167 const std::vector<std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>>&
167 last_chosen_object_info() { 168 last_chosen_object_info() {
168 return last_chosen_object_info_; 169 return last_chosen_object_info_;
169 } 170 }
170 TabSpecificContentSettings* tab_specific_content_settings() { 171 TabSpecificContentSettings* tab_specific_content_settings() {
171 return TabSpecificContentSettings::FromWebContents(web_contents()); 172 return TabSpecificContentSettings::FromWebContents(web_contents());
172 } 173 }
173 InfoBarService* infobar_service() { 174 InfoBarService* infobar_service() {
174 return InfoBarService::FromWebContents(web_contents()); 175 return InfoBarService::FromWebContents(web_contents());
175 } 176 }
176 177
177 WebsiteSettings* website_settings() { 178 WebsiteSettings* website_settings() {
178 if (!website_settings_.get()) { 179 if (!website_settings_.get()) {
179 website_settings_.reset(new WebsiteSettings( 180 website_settings_.reset(new WebsiteSettings(
180 mock_ui(), profile(), tab_specific_content_settings(), web_contents(), 181 mock_ui(), profile(), tab_specific_content_settings(), web_contents(),
181 url(), security_info(), cert_store())); 182 url(), security_info(), cert_store()));
182 } 183 }
183 return website_settings_.get(); 184 return website_settings_.get();
184 } 185 }
185 186
186 device::MockUsbService& usb_service() { return device_client_.usb_service(); } 187 device::MockUsbService& usb_service() { return device_client_.usb_service(); }
187 188
188 SecurityStateModel::SecurityInfo security_info_; 189 SecurityStateModel::SecurityInfo security_info_;
189 190
190 private: 191 private:
191 TestDeviceClient device_client_; 192 TestDeviceClient device_client_;
192 scoped_ptr<WebsiteSettings> website_settings_; 193 std::unique_ptr<WebsiteSettings> website_settings_;
193 scoped_ptr<MockWebsiteSettingsUI> mock_ui_; 194 std::unique_ptr<MockWebsiteSettingsUI> mock_ui_;
194 int cert_id_; 195 int cert_id_;
195 scoped_refptr<net::X509Certificate> cert_; 196 scoped_refptr<net::X509Certificate> cert_;
196 MockCertStore cert_store_; 197 MockCertStore cert_store_;
197 GURL url_; 198 GURL url_;
198 std::vector<scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo>> 199 std::vector<std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo>>
199 last_chosen_object_info_; 200 last_chosen_object_info_;
200 }; 201 };
201 202
202 } // namespace 203 } // namespace
203 204
204 TEST_F(WebsiteSettingsTest, OnPermissionsChanged) { 205 TEST_F(WebsiteSettingsTest, OnPermissionsChanged) {
205 // Setup site permissions. 206 // Setup site permissions.
206 HostContentSettingsMap* content_settings = 207 HostContentSettingsMap* content_settings =
207 HostContentSettingsMapFactory::GetForProfile(profile()); 208 HostContentSettingsMapFactory::GetForProfile(profile());
208 ContentSetting setting = content_settings->GetContentSetting( 209 ContentSetting setting = content_settings->GetContentSetting(
(...skipping 581 matching lines...) Expand 10 before | Expand all | Expand 10 after
790 791
791 TEST_F(WebsiteSettingsTest, InternalPage) { 792 TEST_F(WebsiteSettingsTest, InternalPage) {
792 SetURL("chrome://bookmarks"); 793 SetURL("chrome://bookmarks");
793 SetDefaultUIExpectations(mock_ui()); 794 SetDefaultUIExpectations(mock_ui());
794 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE, 795 EXPECT_EQ(WebsiteSettings::SITE_CONNECTION_STATUS_INTERNAL_PAGE,
795 website_settings()->site_connection_status()); 796 website_settings()->site_connection_status());
796 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE, 797 EXPECT_EQ(WebsiteSettings::SITE_IDENTITY_STATUS_INTERNAL_PAGE,
797 website_settings()->site_identity_status()); 798 website_settings()->site_identity_status());
798 EXPECT_EQ(base::string16(), website_settings()->organization_name()); 799 EXPECT_EQ(base::string16(), website_settings()->organization_name());
799 } 800 }
OLDNEW
« 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