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

Unified Diff: content/browser/geolocation/geolocation_provider_impl.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/browser/geolocation/geolocation_provider_impl.h
diff --git a/content/browser/geolocation/geolocation_provider_impl.h b/content/browser/geolocation/geolocation_provider_impl.h
index 92129c5093fab83cb5621eeda3afd08a717cb4ca..b7c7e9dcbc9ed7681dad836f2f831a8500e88475 100644
--- a/content/browser/geolocation/geolocation_provider_impl.h
+++ b/content/browser/geolocation/geolocation_provider_impl.h
@@ -6,12 +6,12 @@
#define CONTENT_BROWSER_GEOLOCATION_GEOLOCATION_PROVIDER_IMPL_H_
#include <list>
+#include <memory>
#include <vector>
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/threading/thread.h"
#include "content/common/content_export.h"
#include "content/public/browser/geolocation_provider.h"
@@ -29,7 +29,7 @@ class CONTENT_EXPORT GeolocationProviderImpl
public base::Thread {
public:
// GeolocationProvider implementation:
- scoped_ptr<GeolocationProvider::Subscription> AddLocationUpdateCallback(
+ std::unique_ptr<GeolocationProvider::Subscription> AddLocationUpdateCallback(
const LocationUpdateCallback& callback,
bool enable_high_accuracy) override;
void UserDidOptIntoLocationServices() override;
@@ -55,7 +55,7 @@ class CONTENT_EXPORT GeolocationProviderImpl
// Useful for injecting mock geolocation arbitrator in tests.
// TODO(mvanouwerkerk): Use something like SetArbitratorForTesting instead.
- virtual scoped_ptr<LocationArbitrator> CreateArbitrator();
+ virtual std::unique_ptr<LocationArbitrator> CreateArbitrator();
private:
bool OnGeolocationThread() const;
@@ -92,7 +92,7 @@ class CONTENT_EXPORT GeolocationProviderImpl
bool ignore_location_updates_;
// Only to be used on the geolocation thread.
- scoped_ptr<LocationArbitrator> arbitrator_;
+ std::unique_ptr<LocationArbitrator> arbitrator_;
DISALLOW_COPY_AND_ASSIGN(GeolocationProviderImpl);
};
« no previous file with comments | « content/browser/geofencing/geofencing_service_unittest.cc ('k') | content/browser/geolocation/geolocation_provider_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698