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

Side by Side Diff: mojo/public/cpp/bindings/tests/router_unittest.cc

Issue 613053002: Mojo: NULL -> nullptr in mojo/public/cpp/bindings and also for the bindings generator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 <stdlib.h> 5 #include <stdlib.h>
6 #include <string.h> 6 #include <string.h>
7 7
8 #include "mojo/public/cpp/bindings/lib/message_builder.h" 8 #include "mojo/public/cpp/bindings/lib/message_builder.h"
9 #include "mojo/public/cpp/bindings/lib/message_queue.h" 9 #include "mojo/public/cpp/bindings/lib/message_queue.h"
10 #include "mojo/public/cpp/bindings/lib/router.h" 10 #include "mojo/public/cpp/bindings/lib/router.h"
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 AllocResponseMessage(name, "world", request_id, &response); 66 AllocResponseMessage(name, "world", request_id, &response);
67 67
68 bool result = responder->Accept(&response); 68 bool result = responder->Accept(&response);
69 delete responder; 69 delete responder;
70 return result; 70 return result;
71 } 71 }
72 }; 72 };
73 73
74 class LazyResponseGenerator : public ResponseGenerator { 74 class LazyResponseGenerator : public ResponseGenerator {
75 public: 75 public:
76 LazyResponseGenerator() : responder_(NULL), name_(0), request_id_(0) { 76 LazyResponseGenerator() : responder_(nullptr), name_(0), request_id_(0) {
77 } 77 }
78 78
79 virtual ~LazyResponseGenerator() { 79 virtual ~LazyResponseGenerator() {
80 delete responder_; 80 delete responder_;
81 } 81 }
82 82
83 virtual bool AcceptWithResponder(Message* message, 83 virtual bool AcceptWithResponder(Message* message,
84 MessageReceiver* responder) override { 84 MessageReceiver* responder) override {
85 name_ = message->name(); 85 name_ = message->name();
86 request_id_ = message->request_id(); 86 request_id_ = message->request_id();
87 responder_ = responder; 87 responder_ = responder;
88 return true; 88 return true;
89 } 89 }
90 90
91 bool has_responder() const { return !!responder_; } 91 bool has_responder() const { return !!responder_; }
92 92
93 void Complete() { 93 void Complete() {
94 SendResponse(name_, request_id_, responder_); 94 SendResponse(name_, request_id_, responder_);
95 responder_ = NULL; 95 responder_ = nullptr;
96 } 96 }
97 97
98 private: 98 private:
99 MessageReceiver* responder_; 99 MessageReceiver* responder_;
100 uint32_t name_; 100 uint32_t name_;
101 uint32_t request_id_; 101 uint32_t request_id_;
102 }; 102 };
103 103
104 class RouterTest : public testing::Test { 104 class RouterTest : public testing::Test {
105 public: 105 public:
106 RouterTest() { 106 RouterTest() {
107 } 107 }
108 108
109 virtual void SetUp() override { 109 virtual void SetUp() override {
110 CreateMessagePipe(NULL, &handle0_, &handle1_); 110 CreateMessagePipe(nullptr, &handle0_, &handle1_);
111 } 111 }
112 112
113 virtual void TearDown() override {} 113 virtual void TearDown() override {}
114 114
115 void PumpMessages() { 115 void PumpMessages() {
116 loop_.RunUntilIdle(); 116 loop_.RunUntilIdle();
117 } 117 }
118 118
119 protected: 119 protected:
120 ScopedMessagePipeHandle handle0_; 120 ScopedMessagePipeHandle handle0_;
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 EXPECT_TRUE(generator.has_responder()); 218 EXPECT_TRUE(generator.has_responder());
219 219
220 } 220 }
221 221
222 generator.Complete(); // This should end up doing nothing. 222 generator.Complete(); // This should end up doing nothing.
223 } 223 }
224 224
225 } // namespace 225 } // namespace
226 } // namespace test 226 } // namespace test
227 } // namespace mojo 227 } // namespace mojo
OLDNEW
« no previous file with comments | « mojo/public/cpp/bindings/tests/handle_passing_unittest.cc ('k') | mojo/public/cpp/bindings/tests/string_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698