Commit 9899f4eb authored by Sigurdur Asgeirsson's avatar Sigurdur Asgeirsson Committed by Commit Bot

Replace ScopedObserver with base::ScopedObservation in...

Replace ScopedObserver with base::ScopedObservation in /content/browser/storage_partition_impl_unittest.cc.

ScopedObserver is being deprecated in favor of two new classes:
- base::ScopedObservation for observers that only ever observe
  a single source.
- base::ScopedMultiSourceObservation for observers that do or may
  observe more than a single source.
This CL was uploaded by git cl split.

R=kinuko@chromium.org

Change-Id: I87a97adbc8cd1ad3e9bb6131289df74f9afb691a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2526167
Auto-Submit: Sigurður Ásgeirsson <siggi@chromium.org>
Commit-Queue: Kinuko Yasuda <kinuko@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825735}
parent 76bbdfc7
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "base/files/file_util.h" #include "base/files/file_util.h"
#include "base/location.h" #include "base/location.h"
#include "base/run_loop.h" #include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/single_thread_task_runner.h" #include "base/single_thread_task_runner.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/test/bind.h" #include "base/test/bind.h"
...@@ -593,7 +594,7 @@ class RemovePluginPrivateDataTester { ...@@ -593,7 +594,7 @@ class RemovePluginPrivateDataTester {
class MockDataRemovalObserver : public StoragePartition::DataRemovalObserver { class MockDataRemovalObserver : public StoragePartition::DataRemovalObserver {
public: public:
explicit MockDataRemovalObserver(StoragePartition* partition) { explicit MockDataRemovalObserver(StoragePartition* partition) {
observer_.Add(partition); observation_.Observe(partition);
} }
MOCK_METHOD4(OnOriginDataCleared, MOCK_METHOD4(OnOriginDataCleared,
...@@ -603,8 +604,9 @@ class MockDataRemovalObserver : public StoragePartition::DataRemovalObserver { ...@@ -603,8 +604,9 @@ class MockDataRemovalObserver : public StoragePartition::DataRemovalObserver {
base::Time)); base::Time));
private: private:
ScopedObserver<StoragePartition, StoragePartition::DataRemovalObserver> base::ScopedObservation<StoragePartition,
observer_{this}; StoragePartition::DataRemovalObserver>
observation_{this};
}; };
bool IsWebSafeSchemeForTest(const std::string& scheme) { bool IsWebSafeSchemeForTest(const std::string& scheme) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment