Index: chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc |
diff --git a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc |
index 3a772dba41856f94047fc636c58cb387bc6d0bf9..2e51c36d7bf3d01b5db3e7fe104375a8ca7f6b21 100644 |
--- a/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc |
+++ b/chrome/browser/extensions/api/vpn_provider/vpn_provider_apitest.cc |
@@ -6,6 +6,7 @@ |
#include <stdint.h> |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_number_conversions.h" |
#include "chrome/browser/chromeos/profiles/profile_helper.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
@@ -56,8 +57,9 @@ const char* kParameterKeys[] = {shill::kAddressParameterThirdPartyVpn, |
shill::kBroadcastAddressParameterThirdPartyVpn, |
shill::kDomainSearchParameterThirdPartyVpn}; |
-void DoNothingFailureCallback(const std::string& error_name, |
- scoped_ptr<base::DictionaryValue> error_data) { |
+void DoNothingFailureCallback( |
+ const std::string& error_name, |
+ std::unique_ptr<base::DictionaryValue> error_data) { |
EXPECT_EQ(true, false); |
} |
@@ -133,7 +135,7 @@ class VpnProviderApiTest : public ExtensionApiTest, |
ExtensionApiTest::SetUpInProcessBrowserTestFixture(); |
test_client_ = new TestShillThirdPartyVpnDriverClient(); |
DBusThreadManager::GetSetterForTesting()->SetShillThirdPartyVpnDriverClient( |
- make_scoped_ptr(test_client_)); |
+ base::WrapUnique(test_client_)); |
} |
void AddNetworkProfileForUser() { |