OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/service_worker/service_worker_storage.h" | 5 #include "content/browser/service_worker/service_worker_storage.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
10 #include "content/browser/browser_thread_impl.h" | 10 #include "content/browser/browser_thread_impl.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 | 67 |
68 class ServiceWorkerStorageTest : public testing::Test { | 68 class ServiceWorkerStorageTest : public testing::Test { |
69 public: | 69 public: |
70 ServiceWorkerStorageTest() | 70 ServiceWorkerStorageTest() |
71 : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) { | 71 : browser_thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) { |
72 } | 72 } |
73 | 73 |
74 virtual void SetUp() OVERRIDE { | 74 virtual void SetUp() OVERRIDE { |
75 context_.reset(new ServiceWorkerContextCore( | 75 context_.reset(new ServiceWorkerContextCore( |
76 base::FilePath(), | 76 base::FilePath(), |
| 77 base::MessageLoopProxy::current(), |
77 NULL, | 78 NULL, |
78 NULL, | 79 NULL, |
79 scoped_ptr<ServiceWorkerProcessManager>())); | 80 scoped_ptr<ServiceWorkerProcessManager>())); |
80 context_ptr_ = context_->AsWeakPtr(); | 81 context_ptr_ = context_->AsWeakPtr(); |
81 storage()->simulated_lazy_initted_ = true; | 82 storage()->simulated_lazy_initted_ = true; |
82 } | 83 } |
83 | 84 |
84 virtual void TearDown() OVERRIDE { | 85 virtual void TearDown() OVERRIDE { |
85 context_.reset(); | 86 context_.reset(); |
86 } | 87 } |
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
426 | 427 |
427 storage()->GetAllRegistrations( | 428 storage()->GetAllRegistrations( |
428 MakeGetAllCallback(&was_called, &all_registrations)); | 429 MakeGetAllCallback(&was_called, &all_registrations)); |
429 base::RunLoop().RunUntilIdle(); | 430 base::RunLoop().RunUntilIdle(); |
430 ASSERT_TRUE(was_called); | 431 ASSERT_TRUE(was_called); |
431 EXPECT_TRUE(all_registrations.empty()); | 432 EXPECT_TRUE(all_registrations.empty()); |
432 was_called = false; | 433 was_called = false; |
433 } | 434 } |
434 | 435 |
435 } // namespace content | 436 } // namespace content |
OLD | NEW |