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

Unified Diff: chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc

Issue 1165913002: [Cleanup] Used scoped pointers in KeyedServiceFactory's SetTestingFactory functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 6 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
Index: chrome/browser/extensions/api/networking_private/networking_private_service_client_apitest.cc
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 6de03c93b5a9519112af044ff91822144e039f0d..4b25a96ecb34d2182a7593fef0befa16a5b65042 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
@@ -6,6 +6,7 @@
#include "base/callback.h"
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/scoped_ptr.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/api/networking_private/networking_private_credentials_getter.h"
#include "chrome/browser/extensions/extension_apitest.h"
@@ -83,12 +84,12 @@ class NetworkingPrivateServiceClientApiTest : public ExtensionApiTest {
"epcifkihnkjgphfkloaaleeakhpmgdmn");
}
- static KeyedService* CreateNetworkingPrivateServiceClient(
+ static scoped_ptr<KeyedService> CreateNetworkingPrivateServiceClient(
content::BrowserContext* profile) {
Devlin 2015/06/08 19:29:43 nit: rename
Ilya Sherman 2015/06/08 22:11:43 Done.
scoped_ptr<wifi::FakeWiFiService> wifi_service(new wifi::FakeWiFiService());
scoped_ptr<CryptoVerifyStub> crypto_verify(new CryptoVerifyStub);
- return new NetworkingPrivateServiceClient(wifi_service.Pass(),
- crypto_verify.Pass());
+ return scoped_ptr<KeyedService>(new NetworkingPrivateServiceClient(
+ wifi_service.Pass(), crypto_verify.Pass()));
}
void SetUpOnMainThread() override {

Powered by Google App Engine
This is Rietveld 408576698