summaryrefslogtreecommitdiffstats
path: root/content/browser/notifications
diff options
context:
space:
mode:
authorskyostil <skyostil@chromium.org>2015-06-05 08:26:08 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-05 15:26:51 +0000
commit74f13dc2b62abb34e947093fe2600f9c539e60ef (patch)
treec298260fa8c56717943ff45efda601f312cc74c4 /content/browser/notifications
parenta95af720637c609f33ed76d89d658041f354a222 (diff)
downloadchromium_src-74f13dc2b62abb34e947093fe2600f9c539e60ef.zip
chromium_src-74f13dc2b62abb34e947093fe2600f9c539e60ef.tar.gz
chromium_src-74f13dc2b62abb34e947093fe2600f9c539e60ef.tar.bz2
Revert "content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs"
This reverts commit 5d18b2493af36d77d3c491854e3d56f46f5f747c. Reason: Broke iOS build: http://build.chromium.org/p/chromium.mac/builders/iOS_Simulator_%28dbg%29/builds/27843 NOTRY=true NOTREECHECKS=true BUG=465354 TBR=sievers@chromium.org,nick@chromium.org Review URL: https://codereview.chromium.org/1153503009 Cr-Commit-Position: refs/heads/master@{#333047}
Diffstat (limited to 'content/browser/notifications')
-rw-r--r--content/browser/notifications/platform_notification_context_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/content/browser/notifications/platform_notification_context_unittest.cc b/content/browser/notifications/platform_notification_context_unittest.cc
index 4560f7d..30ab46a 100644
--- a/content/browser/notifications/platform_notification_context_unittest.cc
+++ b/content/browser/notifications/platform_notification_context_unittest.cc
@@ -6,7 +6,6 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/run_loop.h"
-#include "base/thread_task_runner_handle.h"
#include "content/browser/notifications/platform_notification_context_impl.h"
#include "content/browser/service_worker/embedded_worker_test_helper.h"
#include "content/browser/service_worker/service_worker_context_wrapper.h"
@@ -100,7 +99,7 @@ class PlatformNotificationContextTest : public ::testing::Test {
// Overrides the task runner in |context| with the current message loop
// proxy, to reduce the number of threads involved in the tests.
void OverrideTaskRunnerForTesting(PlatformNotificationContextImpl* context) {
- context->SetTaskRunnerForTesting(base::ThreadTaskRunnerHandle::Get());
+ context->SetTaskRunnerForTesting(base::MessageLoopProxy::current());
}
// Returns the testing browsing context that can be used for this test.