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

Side by Side Diff: blimp/net/blimp_connection_unittest.cc

Issue 1933053003: Used oneof in blimp_message.proto (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits Created 4 years, 7 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
« no previous file with comments | « blimp/engine/session/blimp_engine_session.cc ('k') | blimp/net/blimp_message_checkpointer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "blimp/net/blimp_connection.h" 5 #include "blimp/net/blimp_connection.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 10
11 #include "base/callback_helpers.h" 11 #include "base/callback_helpers.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "blimp/common/create_blimp_message.h"
14 #include "blimp/common/proto/blimp_message.pb.h" 15 #include "blimp/common/proto/blimp_message.pb.h"
15 #include "blimp/net/common.h" 16 #include "blimp/net/common.h"
16 #include "blimp/net/connection_error_observer.h" 17 #include "blimp/net/connection_error_observer.h"
17 #include "blimp/net/test_common.h" 18 #include "blimp/net/test_common.h"
18 #include "net/base/completion_callback.h" 19 #include "net/base/completion_callback.h"
19 #include "net/base/io_buffer.h" 20 #include "net/base/io_buffer.h"
20 #include "net/base/net_errors.h" 21 #include "net/base/net_errors.h"
21 #include "net/base/test_completion_callback.h" 22 #include "net/base/test_completion_callback.h"
22 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
23 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 17 matching lines...) Expand all
41 connection_->AddConnectionErrorObserver(&error_observer1_); 42 connection_->AddConnectionErrorObserver(&error_observer1_);
42 connection_->AddConnectionErrorObserver(&error_observer2_); 43 connection_->AddConnectionErrorObserver(&error_observer2_);
43 connection_->AddConnectionErrorObserver(&error_observer3_); 44 connection_->AddConnectionErrorObserver(&error_observer3_);
44 connection_->RemoveConnectionErrorObserver(&error_observer3_); 45 connection_->RemoveConnectionErrorObserver(&error_observer3_);
45 } 46 }
46 47
47 ~BlimpConnectionTest() override {} 48 ~BlimpConnectionTest() override {}
48 49
49 protected: 50 protected:
50 std::unique_ptr<BlimpMessage> CreateInputMessage() { 51 std::unique_ptr<BlimpMessage> CreateInputMessage() {
51 std::unique_ptr<BlimpMessage> msg(new BlimpMessage); 52 InputMessage* input;
52 msg->set_type(BlimpMessage::INPUT); 53 return CreateBlimpMessage(&input);
53 return msg;
54 } 54 }
55 55
56 std::unique_ptr<BlimpMessage> CreateControlMessage() { 56 std::unique_ptr<BlimpMessage> CreateControlMessage() {
57 std::unique_ptr<BlimpMessage> msg(new BlimpMessage); 57 TabControlMessage* control;
58 msg->set_type(BlimpMessage::TAB_CONTROL); 58 return CreateBlimpMessage(&control);
59 return msg;
60 } 59 }
61 60
62 base::MessageLoop message_loop_; 61 base::MessageLoop message_loop_;
63 testing::StrictMock<MockPacketWriter>* writer_; 62 testing::StrictMock<MockPacketWriter>* writer_;
64 testing::StrictMock<MockConnectionErrorObserver> error_observer1_; 63 testing::StrictMock<MockConnectionErrorObserver> error_observer1_;
65 testing::StrictMock<MockConnectionErrorObserver> error_observer2_; 64 testing::StrictMock<MockConnectionErrorObserver> error_observer2_;
66 65
67 // This error observer is Removed() immediately after it's added; 66 // This error observer is Removed() immediately after it's added;
68 // it should never be called. 67 // it should never be called.
69 testing::StrictMock<MockConnectionErrorObserver> error_observer3_; 68 testing::StrictMock<MockConnectionErrorObserver> error_observer3_;
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 129
131 net::TestCompletionCallback complete_cb_2; 130 net::TestCompletionCallback complete_cb_2;
132 sender->ProcessMessage(CreateControlMessage(), 131 sender->ProcessMessage(CreateControlMessage(),
133 complete_cb_2.callback()); 132 complete_cb_2.callback());
134 base::ResetAndReturn(&write_packet_cb).Run(net::ERR_FAILED); 133 base::ResetAndReturn(&write_packet_cb).Run(net::ERR_FAILED);
135 EXPECT_EQ(net::ERR_FAILED, complete_cb_2.WaitForResult()); 134 EXPECT_EQ(net::ERR_FAILED, complete_cb_2.WaitForResult());
136 } 135 }
137 136
138 } // namespace 137 } // namespace
139 } // namespace blimp 138 } // namespace blimp
OLDNEW
« no previous file with comments | « blimp/engine/session/blimp_engine_session.cc ('k') | blimp/net/blimp_message_checkpointer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698