Swap ownership of RulesetService and the content delegate

components/subresource_filter/core/browser/ruleset_service_unittest.cc

Index: components/subresource_filter/core/browser/ruleset_service_unittest.cc
diff --git a/components/subresource_filter/core/browser/ruleset_service_unittest.cc b/components/subresource_filter/core/browser/ruleset_service_unittest.cc
index 0e300937b96fe8d79bce1411eddf41b6b4b92f6d..47abfa9aad03fa0a8e19bd3d6386dff8e9d0a41b 100644
--- a/components/subresource_filter/core/browser/ruleset_service_unittest.cc
+++ b/components/subresource_filter/core/browser/ruleset_service_unittest.cc
@@ -145,8 +145,7 @@ class SubresourceFilteringRulesetServiceTest : public ::testing::Test {
  public:
   SubresourceFilteringRulesetServiceTest()
       : task_runner_(new base::TestSimpleTaskRunner),
-        task_runner_handle_(task_runner_),
-        mock_delegate_(nullptr) {}
+        task_runner_handle_(task_runner_) {}
 
  protected:
   void SetUp() override {
@@ -172,15 +171,14 @@ class SubresourceFilteringRulesetServiceTest : public ::testing::Test {
   }
 
   void ResetRulesetService() {
+    mock_delegate_ = base::MakeUnique<MockRulesetServiceDelegate>();
     service_ = base::MakeUnique<RulesetService>(
-        &pref_service_, task_runner_,
-        base::WrapUnique(mock_delegate_ = new MockRulesetServiceDelegate),
-        base_dir());
+        &pref_service_, task_runner_, mock_delegate_.get(), base_dir());
   }
 
   void ClearRulesetService() {
-    mock_delegate_ = nullptr;
     service_.reset();
+    mock_delegate_.reset();
   }
 
   // Creates a new file with the given license |contents| at a unique temporary
@@ -269,7 +267,7 @@ class SubresourceFilteringRulesetServiceTest : public ::testing::Test {
 
   PrefService* prefs() { return &pref_service_; }
   RulesetService* service() { return service_.get(); }
-  MockRulesetServiceDelegate* mock_delegate() { return mock_delegate_; }
+  MockRulesetServiceDelegate* mock_delegate() { return mock_delegate_.get(); }
 
   virtual base::FilePath effective_temp_dir() const {
     return scoped_temp_dir_.GetPath();
@@ -296,7 +294,7 @@ class SubresourceFilteringRulesetServiceTest : public ::testing::Test {
   TestRulesetPair test_ruleset_3_;
 
   std::unique_ptr<RulesetService> service_;
-  MockRulesetServiceDelegate* mock_delegate_;  // Weak, owned by |service_|.
+  std::unique_ptr<MockRulesetServiceDelegate> mock_delegate_;

[pkalinnikov, 2017/03/09 16:09:01]

Please swap the lines to ensure that |mock_delegate_| outlives |service_|.

[Charlie Harrison, 2017/03/09 16:12:44]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(SubresourceFilteringRulesetServiceTest);
 };