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

Side by Side Diff: chrome/browser/extensions/api/dial/dial_service_unittest.cc

Issue 136683004: Removes MessageLoop::TYPE_XXX where possible (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve merge Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/memory/ref_counted.h" 5 #include "base/memory/ref_counted.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "chrome/browser/extensions/api/dial/dial_device_data.h" 8 #include "chrome/browser/extensions/api/dial/dial_device_data.h"
9 #include "chrome/browser/extensions/api/dial/dial_service.h" 9 #include "chrome/browser/extensions/api/dial/dial_service.h"
10 #include "net/base/capturing_net_log.h" 10 #include "net/base/capturing_net_log.h"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 } 50 }
51 protected: 51 protected:
52 net::CapturingNetLog capturing_net_log_; 52 net::CapturingNetLog capturing_net_log_;
53 net::IPAddressNumber mock_ip_; 53 net::IPAddressNumber mock_ip_;
54 DialServiceImpl dial_service_; 54 DialServiceImpl dial_service_;
55 scoped_ptr<DialServiceImpl::DialSocket> dial_socket_; 55 scoped_ptr<DialServiceImpl::DialSocket> dial_socket_;
56 MockObserver mock_observer_; 56 MockObserver mock_observer_;
57 }; 57 };
58 58
59 TEST_F(DialServiceTest, TestSendMultipleRequests) { 59 TEST_F(DialServiceTest, TestSendMultipleRequests) {
60 base::MessageLoop loop(base::MessageLoop::TYPE_IO); 60 base::MessageLoopForIO loop;
61 // Setting the finish delay to zero disables the timer that invokes 61 // Setting the finish delay to zero disables the timer that invokes
62 // FinishDiscovery(). 62 // FinishDiscovery().
63 dial_service_.finish_delay_ = TimeDelta::FromSeconds(0); 63 dial_service_.finish_delay_ = TimeDelta::FromSeconds(0);
64 dial_service_.request_interval_ = TimeDelta::FromSeconds(0); 64 dial_service_.request_interval_ = TimeDelta::FromSeconds(0);
65 dial_service_.max_requests_ = 4; 65 dial_service_.max_requests_ = 4;
66 dial_service_.discovery_active_ = true; 66 dial_service_.discovery_active_ = true;
67 EXPECT_CALL(mock_observer_, OnDiscoveryRequest(A<DialService*>())).Times(4); 67 EXPECT_CALL(mock_observer_, OnDiscoveryRequest(A<DialService*>())).Times(4);
68 EXPECT_CALL(mock_observer_, OnDiscoveryFinished(A<DialService*>())).Times(1); 68 EXPECT_CALL(mock_observer_, OnDiscoveryFinished(A<DialService*>())).Times(1);
69 dial_service_.BindAndAddSocket(mock_ip_); 69 dial_service_.BindAndAddSocket(mock_ip_);
70 EXPECT_EQ(1u, dial_service_.dial_sockets_.size()); 70 EXPECT_EQ(1u, dial_service_.dial_sockets_.size());
71 dial_service_.SendOneRequest(); 71 dial_service_.SendOneRequest();
72 loop.RunUntilIdle(); 72 loop.RunUntilIdle();
73 dial_service_.FinishDiscovery(); 73 dial_service_.FinishDiscovery();
74 } 74 }
75 75
76 TEST_F(DialServiceTest, TestMultipleNetworkInterfaces) { 76 TEST_F(DialServiceTest, TestMultipleNetworkInterfaces) {
77 base::MessageLoop loop(base::MessageLoop::TYPE_IO); 77 base::MessageLoopForIO loop;
78 // Setting the finish delay to zero disables the timer that invokes 78 // Setting the finish delay to zero disables the timer that invokes
79 // FinishDiscovery(). 79 // FinishDiscovery().
80 dial_service_.finish_delay_ = TimeDelta::FromSeconds(0); 80 dial_service_.finish_delay_ = TimeDelta::FromSeconds(0);
81 dial_service_.request_interval_ = TimeDelta::FromSeconds(0); 81 dial_service_.request_interval_ = TimeDelta::FromSeconds(0);
82 dial_service_.max_requests_ = 4; 82 dial_service_.max_requests_ = 4;
83 dial_service_.discovery_active_ = true; 83 dial_service_.discovery_active_ = true;
84 net::NetworkInterfaceList interface_list; 84 net::NetworkInterfaceList interface_list;
85 interface_list.push_back(net::NetworkInterface("network1", 0, mock_ip_, 0)); 85 interface_list.push_back(net::NetworkInterface("network1", 0, mock_ip_, 0));
86 interface_list.push_back(net::NetworkInterface("network2", 1, mock_ip_, 0)); 86 interface_list.push_back(net::NetworkInterface("network2", 1, mock_ip_, 0));
87 interface_list.push_back(net::NetworkInterface("network3", 2, mock_ip_, 0)); 87 interface_list.push_back(net::NetworkInterface("network3", 2, mock_ip_, 0));
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 // Empty USN 189 // Empty USN
190 EXPECT_FALSE(DialServiceImpl::DialSocket::ParseResponse( 190 EXPECT_FALSE(DialServiceImpl::DialSocket::ParseResponse(
191 "HTTP/1.1 OK\r\n" 191 "HTTP/1.1 OK\r\n"
192 "LOCATION: http://127.0.0.1/dd.xml\r\n" 192 "LOCATION: http://127.0.0.1/dd.xml\r\n"
193 "USN:\r\n\r\n", 193 "USN:\r\n\r\n",
194 now, &not_parsed)); 194 now, &not_parsed));
195 } 195 }
196 196
197 } // namespace extensions 197 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698