Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(193)

Side by Side Diff: content/browser/service_worker/service_worker_version_unittest.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "content/browser/service_worker/embedded_worker_registry.h" 7 #include "content/browser/service_worker/embedded_worker_registry.h"
8 #include "content/browser/service_worker/embedded_worker_test_helper.h" 8 #include "content/browser/service_worker/embedded_worker_test_helper.h"
9 #include "content/browser/service_worker/service_worker_context_core.h" 9 #include "content/browser/service_worker/service_worker_context_core.h"
10 #include "content/browser/service_worker/service_worker_registration.h" 10 #include "content/browser/service_worker/service_worker_registration.h"
(...skipping 22 matching lines...) Expand all
33 33
34 class MessageReceiver : public EmbeddedWorkerTestHelper { 34 class MessageReceiver : public EmbeddedWorkerTestHelper {
35 public: 35 public:
36 MessageReceiver() 36 MessageReceiver()
37 : EmbeddedWorkerTestHelper(kRenderProcessId), 37 : EmbeddedWorkerTestHelper(kRenderProcessId),
38 current_embedded_worker_id_(0) {} 38 current_embedded_worker_id_(0) {}
39 virtual ~MessageReceiver() {} 39 virtual ~MessageReceiver() {}
40 40
41 virtual bool OnMessageToWorker(int thread_id, 41 virtual bool OnMessageToWorker(int thread_id,
42 int embedded_worker_id, 42 int embedded_worker_id,
43 const IPC::Message& message) OVERRIDE { 43 const IPC::Message& message) override {
44 if (EmbeddedWorkerTestHelper::OnMessageToWorker( 44 if (EmbeddedWorkerTestHelper::OnMessageToWorker(
45 thread_id, embedded_worker_id, message)) { 45 thread_id, embedded_worker_id, message)) {
46 return true; 46 return true;
47 } 47 }
48 current_embedded_worker_id_ = embedded_worker_id; 48 current_embedded_worker_id_ = embedded_worker_id;
49 bool handled = true; 49 bool handled = true;
50 IPC_BEGIN_MESSAGE_MAP(MessageReceiver, message) 50 IPC_BEGIN_MESSAGE_MAP(MessageReceiver, message)
51 IPC_MESSAGE_HANDLER(TestMsg_Message, OnMessage) 51 IPC_MESSAGE_HANDLER(TestMsg_Message, OnMessage)
52 IPC_MESSAGE_UNHANDLED(handled = false) 52 IPC_MESSAGE_UNHANDLED(handled = false)
53 IPC_END_MESSAGE_MAP() 53 IPC_END_MESSAGE_MAP()
(...skipping 28 matching lines...) Expand all
82 class MessageReceiverFromWorker : public EmbeddedWorkerInstance::Listener { 82 class MessageReceiverFromWorker : public EmbeddedWorkerInstance::Listener {
83 public: 83 public:
84 explicit MessageReceiverFromWorker(EmbeddedWorkerInstance* instance) 84 explicit MessageReceiverFromWorker(EmbeddedWorkerInstance* instance)
85 : instance_(instance) { 85 : instance_(instance) {
86 instance_->AddListener(this); 86 instance_->AddListener(this);
87 } 87 }
88 virtual ~MessageReceiverFromWorker() { 88 virtual ~MessageReceiverFromWorker() {
89 instance_->RemoveListener(this); 89 instance_->RemoveListener(this);
90 } 90 }
91 91
92 virtual void OnStarted() OVERRIDE { NOTREACHED(); } 92 virtual void OnStarted() override { NOTREACHED(); }
93 virtual void OnStopped() OVERRIDE { NOTREACHED(); } 93 virtual void OnStopped() override { NOTREACHED(); }
94 virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE { 94 virtual bool OnMessageReceived(const IPC::Message& message) override {
95 bool handled = true; 95 bool handled = true;
96 IPC_BEGIN_MESSAGE_MAP(MessageReceiverFromWorker, message) 96 IPC_BEGIN_MESSAGE_MAP(MessageReceiverFromWorker, message)
97 IPC_MESSAGE_HANDLER(TestMsg_MessageFromWorker, OnMessageFromWorker) 97 IPC_MESSAGE_HANDLER(TestMsg_MessageFromWorker, OnMessageFromWorker)
98 IPC_MESSAGE_UNHANDLED(handled = false) 98 IPC_MESSAGE_UNHANDLED(handled = false)
99 IPC_END_MESSAGE_MAP() 99 IPC_END_MESSAGE_MAP()
100 return handled; 100 return handled;
101 } 101 }
102 102
103 void OnMessageFromWorker(int value) { received_values_.push_back(value); } 103 void OnMessageFromWorker(int value) { received_values_.push_back(value); }
104 const std::vector<int>& received_values() const { return received_values_; } 104 const std::vector<int>& received_values() const { return received_values_; }
105 105
106 private: 106 private:
107 EmbeddedWorkerInstance* instance_; 107 EmbeddedWorkerInstance* instance_;
108 std::vector<int> received_values_; 108 std::vector<int> received_values_;
109 DISALLOW_COPY_AND_ASSIGN(MessageReceiverFromWorker); 109 DISALLOW_COPY_AND_ASSIGN(MessageReceiverFromWorker);
110 }; 110 };
111 111
112 } // namespace 112 } // namespace
113 113
114 class ServiceWorkerVersionTest : public testing::Test { 114 class ServiceWorkerVersionTest : public testing::Test {
115 protected: 115 protected:
116 ServiceWorkerVersionTest() 116 ServiceWorkerVersionTest()
117 : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {} 117 : thread_bundle_(TestBrowserThreadBundle::IO_MAINLOOP) {}
118 118
119 virtual void SetUp() OVERRIDE { 119 virtual void SetUp() override {
120 helper_.reset(new MessageReceiver()); 120 helper_.reset(new MessageReceiver());
121 121
122 pattern_ = GURL("http://www.example.com/"); 122 pattern_ = GURL("http://www.example.com/");
123 registration_ = new ServiceWorkerRegistration( 123 registration_ = new ServiceWorkerRegistration(
124 pattern_, 124 pattern_,
125 1L, 125 1L,
126 helper_->context()->AsWeakPtr()); 126 helper_->context()->AsWeakPtr());
127 version_ = new ServiceWorkerVersion( 127 version_ = new ServiceWorkerVersion(
128 registration_.get(), 128 registration_.get(),
129 GURL("http://www.example.com/service_worker.js"), 129 GURL("http://www.example.com/service_worker.js"),
130 1L, 130 1L,
131 helper_->context()->AsWeakPtr()); 131 helper_->context()->AsWeakPtr());
132 132
133 // Simulate adding one process to the pattern. 133 // Simulate adding one process to the pattern.
134 helper_->SimulateAddProcessToPattern(pattern_, kRenderProcessId); 134 helper_->SimulateAddProcessToPattern(pattern_, kRenderProcessId);
135 ASSERT_TRUE(helper_->context()->process_manager() 135 ASSERT_TRUE(helper_->context()->process_manager()
136 ->PatternHasProcessToRun(pattern_)); 136 ->PatternHasProcessToRun(pattern_));
137 } 137 }
138 138
139 virtual void TearDown() OVERRIDE { 139 virtual void TearDown() override {
140 version_ = 0; 140 version_ = 0;
141 registration_ = 0; 141 registration_ = 0;
142 helper_.reset(); 142 helper_.reset();
143 } 143 }
144 144
145 TestBrowserThreadBundle thread_bundle_; 145 TestBrowserThreadBundle thread_bundle_;
146 scoped_ptr<MessageReceiver> helper_; 146 scoped_ptr<MessageReceiver> helper_;
147 scoped_refptr<ServiceWorkerRegistration> registration_; 147 scoped_refptr<ServiceWorkerRegistration> registration_;
148 scoped_refptr<ServiceWorkerVersion> version_; 148 scoped_refptr<ServiceWorkerVersion> version_;
149 GURL pattern_; 149 GURL pattern_;
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 390
391 version_->StartWorker( 391 version_->StartWorker(
392 CreateReceiverOnCurrentThread(&status)); 392 CreateReceiverOnCurrentThread(&status));
393 base::RunLoop().RunUntilIdle(); 393 base::RunLoop().RunUntilIdle();
394 394
395 // Recreated when the worker starts again. 395 // Recreated when the worker starts again.
396 EXPECT_TRUE(version_->cache_listener_.get()); 396 EXPECT_TRUE(version_->cache_listener_.get());
397 } 397 }
398 398
399 } // namespace content 399 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698