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

Side by Side Diff: net/socket/websocket_endpoint_lock_manager_unittest.cc

Issue 2333923004: Extracting NetLog inner classes into their own classes. (Closed)
Patch Set: Some nit fixes and better, impl-agnostic naming of net_log_parameters_callback_typedef.h -> net/log… Created 4 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 "net/socket/websocket_endpoint_lock_manager.h" 5 #include "net/socket/websocket_endpoint_lock_manager.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "net/base/ip_address.h" 12 #include "net/base/ip_address.h"
13 #include "net/base/net_errors.h" 13 #include "net/base/net_errors.h"
14 #include "net/log/net_log_with_source.h"
14 #include "net/socket/next_proto.h" 15 #include "net/socket/next_proto.h"
15 #include "net/socket/socket_test_util.h" 16 #include "net/socket/socket_test_util.h"
16 #include "net/socket/stream_socket.h" 17 #include "net/socket/stream_socket.h"
17 #include "net/test/gtest_util.h" 18 #include "net/test/gtest_util.h"
18 #include "testing/gmock/include/gmock/gmock.h" 19 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 21
21 using net::test::IsOk; 22 using net::test::IsOk;
22 23
23 namespace net { 24 namespace net {
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 blocking_waiter.WaitForLock(); 331 blocking_waiter.WaitForLock();
331 TimeTicks after_unlock = TimeTicks::Now(); 332 TimeTicks after_unlock = TimeTicks::Now();
332 EXPECT_GE(after_unlock - before_unlock, unlock_delay); 333 EXPECT_GE(after_unlock - before_unlock, unlock_delay);
333 instance()->SetUnlockDelayForTesting(base::TimeDelta()); 334 instance()->SetUnlockDelayForTesting(base::TimeDelta());
334 UnlockDummyEndpoint(1); 335 UnlockDummyEndpoint(1);
335 } 336 }
336 337
337 } // namespace 338 } // namespace
338 339
339 } // namespace net 340 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698