Revert of Force HostContentSettingsMap to be destroyed on its owning thread.

chrome/browser/notifications/notification_permission_context_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/notifications/notification_permission_context.h"
 
 #include "base/bind.h"
-#include "base/memory/ptr_util.h"
-#include "base/test/scoped_mock_time_message_loop_task_runner.h"
+#include "base/message_loop/message_loop.h"
+#include "base/test/test_mock_time_task_runner.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/notifications/desktop_notification_profile_util.h"
 #include "chrome/browser/permissions/permission_manager.h"
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/permissions/permission_request_id.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
@@ skipping 53 matching lines @@
   int permission_set_count_;
   bool last_permission_set_persisted_;
   ContentSetting last_permission_set_setting_;
 };
 
 }  // namespace
 
 class NotificationPermissionContextTest
     : public ChromeRenderViewHostTestHarness {
  public:
+  scoped_refptr<base::TestMockTimeTaskRunner> SwitchToMockTime() {
+    old_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+    scoped_refptr<base::TestMockTimeTaskRunner> task_runner(
+        new base::TestMockTimeTaskRunner(base::Time::Now(),
+                                         base::TimeTicks::Now()));
+    base::MessageLoop::current()->SetTaskRunner(task_runner);
+    return task_runner;
+  }
+
   void TearDown() override {
-    mock_time_task_runner_.reset();
+    if (old_task_runner_) {
+      base::MessageLoop::current()->SetTaskRunner(old_task_runner_);
+      old_task_runner_ = nullptr;
+    }
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
  protected:
-  base::TestMockTimeTaskRunner* SwitchToMockTime() {
-    EXPECT_FALSE(mock_time_task_runner_);
-    mock_time_task_runner_ =
-        base::MakeUnique<base::ScopedMockTimeMessageLoopTaskRunner>();
-    return mock_time_task_runner_->task_runner();
-  }
-
   void UpdateContentSetting(NotificationPermissionContext* context,
                             const GURL& requesting_origin,
                             const GURL& embedding_origin,
                             ContentSetting setting) {
     context->UpdateContentSetting(requesting_origin, embedding_origin, setting);
   }
 
  private:
-  std::unique_ptr<base::ScopedMockTimeMessageLoopTaskRunner>
-      mock_time_task_runner_;
+  scoped_refptr<base::SingleThreadTaskRunner> old_task_runner_;
 };
 
 // Web Notification permission requests will completely ignore the embedder
 // origin. See https://crbug.com/416894.
 TEST_F(NotificationPermissionContextTest, IgnoresEmbedderOrigin) {
   GURL requesting_origin("https://example.com");
   GURL embedding_origin("https://chrome.com");
   GURL different_origin("https://foobar.com");
 
   NotificationPermissionContext context(profile(),
@@ skipping 87 matching lines @@
 TEST_F(NotificationPermissionContextTest, TestDenyInIncognitoAfterDelay) {
   TestNotificationPermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
   GURL url("https://www.example.com");
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
                                web_contents()->GetMainFrame()->GetRoutingID(),
                                -1);
 
-  base::TestMockTimeTaskRunner* task_runner = SwitchToMockTime();
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner(SwitchToMockTime());
 
   ASSERT_EQ(0, permission_context.permission_set_count());
   ASSERT_FALSE(permission_context.last_permission_set_persisted());
   ASSERT_EQ(CONTENT_SETTING_DEFAULT,
             permission_context.last_permission_set_setting());
 
   permission_context.RequestPermission(
       web_contents(), id, url, true /* user_gesture */, base::Bind(&DoNothing));
 
   // Should be blocked after 1-2 seconds, but the timer is reset whenever the
@@ skipping 45 matching lines @@
 TEST_F(NotificationPermissionContextTest, TestCancelledIncognitoRequest) {
   TestNotificationPermissionContext permission_context(
       profile()->GetOffTheRecordProfile());
   GURL url("https://www.example.com");
   NavigateAndCommit(url);
 
   const PermissionRequestID id(web_contents()->GetRenderProcessHost()->GetID(),
                                web_contents()->GetMainFrame()->GetRoutingID(),
                                -1);
 
-  base::TestMockTimeTaskRunner* task_runner = SwitchToMockTime();
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner(SwitchToMockTime());
 
   content::PermissionManager* permission_manager =
       PermissionManagerFactory::GetForProfile(
           profile()->GetOffTheRecordProfile());
 
   // Request and cancel the permission via PermissionManager. That way if
   // https://crbug.com/586944 regresses, then as well as the EXPECT_EQs below
   // failing, PermissionManager::OnPermissionsRequestResponseStatus will crash.
   int request_id = permission_manager->RequestPermission(
       content::PermissionType::NOTIFICATIONS, web_contents()->GetMainFrame(),
@@ skipping 16 matching lines @@
   NavigateAndCommit(url);
   web_contents()->WasShown();
 
   const PermissionRequestID id0(web_contents()->GetRenderProcessHost()->GetID(),
                                 web_contents()->GetMainFrame()->GetRoutingID(),
                                 0);
   const PermissionRequestID id1(web_contents()->GetRenderProcessHost()->GetID(),
                                 web_contents()->GetMainFrame()->GetRoutingID(),
                                 1);
 
-  base::TestMockTimeTaskRunner* task_runner = SwitchToMockTime();
+  scoped_refptr<base::TestMockTimeTaskRunner> task_runner(SwitchToMockTime());
 
   ASSERT_EQ(0, permission_context.permission_set_count());
   ASSERT_FALSE(permission_context.last_permission_set_persisted());
   ASSERT_EQ(CONTENT_SETTING_DEFAULT,
             permission_context.last_permission_set_setting());
 
   permission_context.RequestPermission(web_contents(), id0, url,
                                        true /* user_gesture */,
                                        base::Bind(&DoNothing));
   permission_context.RequestPermission(web_contents(), id1, url,
@@ skipping 23 matching lines @@
   // After another 2.5 seconds, the second permission request should also have
   // received a response.
   task_runner->FastForwardBy(base::TimeDelta::FromMilliseconds(2500));
   EXPECT_EQ(2, permission_context.permission_set_count());
   EXPECT_TRUE(permission_context.last_permission_set_persisted());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             permission_context.last_permission_set_setting());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             permission_context.GetContentSettingFromMap(url, url));
 }