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

Side by Side Diff: chrome/browser/ui/webui/options/preferences_browsertest.cc

Issue 2251263003: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 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/webui/options/preferences_browsertest.h" 5 #include "chrome/browser/ui/webui/options/preferences_browsertest.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <iostream> 9 #include <iostream>
10 #include <memory> 10 #include <memory>
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 " \"PAC\": \"http://domain.com/x\"," 876 " \"PAC\": \"http://domain.com/x\","
877 " \"Type\": \"PAC\" }" 877 " \"Type\": \"PAC\" }"
878 " }" 878 " }"
879 " ]," 879 " ],"
880 " \"Type\": \"UnencryptedConfiguration\"" 880 " \"Type\": \"UnencryptedConfiguration\""
881 "}"; 881 "}";
882 882
883 policy::PolicyMap map; 883 policy::PolicyMap map;
884 map.Set(policy_name, policy::POLICY_LEVEL_MANDATORY, scope, 884 map.Set(policy_name, policy::POLICY_LEVEL_MANDATORY, scope,
885 policy::POLICY_SOURCE_CLOUD, 885 policy::POLICY_SOURCE_CLOUD,
886 base::WrapUnique(new base::StringValue(onc_policy)), nullptr); 886 base::MakeUnique<base::StringValue>(onc_policy), nullptr);
887 policy_provider_.UpdateChromePolicy(map); 887 policy_provider_.UpdateChromePolicy(map);
888 888
889 content::RunAllPendingInMessageLoop(); 889 content::RunAllPendingInMessageLoop();
890 } 890 }
891 891
892 const chromeos::NetworkState* GetDefaultNetwork() { 892 const chromeos::NetworkState* GetDefaultNetwork() {
893 chromeos::NetworkStateHandler* handler = 893 chromeos::NetworkStateHandler* handler =
894 chromeos::NetworkHandler::Get()->network_state_handler(); 894 chromeos::NetworkHandler::Get()->network_state_handler();
895 return handler->DefaultNetwork(); 895 return handler->DefaultNetwork();
896 } 896 }
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
1080 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2)); 1080 SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2));
1081 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3)); 1081 SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3));
1082 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4)); 1082 SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4));
1083 1083
1084 VerifyCurrentProxyServer( 1084 VerifyCurrentProxyServer(
1085 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4", 1085 "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4",
1086 onc::ONC_SOURCE_NONE); 1086 onc::ONC_SOURCE_NONE);
1087 } 1087 }
1088 1088
1089 #endif 1089 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/home_page_overlay_handler.cc ('k') | chrome/browser/ui/webui/options/startup_pages_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698