chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc - Issue 393023003: Added connection timeout functionality to CastSocket.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc

Issue 393023003: Added connection timeout functionality to CastSocket. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added missing initializer for CastSocket unit tests. Created 6 years, 5 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/cast_channel/cast_channel_api.cc ('k') | chrome/browser/extensions/api/cast_channel/cast_socket.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc

diff --git a/chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc b/chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc

index 329e9d01e2ceb619bec901a9885497157a8797cd..6c0162e125a6861b8e400e1d60896c67ff4883f9 100644

--- a/chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc

+++ b/chrome/browser/extensions/api/cast_channel/cast_channel_apitest.cc

@@ -39,6 +39,7 @@ using ::testing::Return;

namespace {

const char kTestExtensionId[] = "ddchlicdkolnonkihahngkmmmjnjlkkf";

+const int64 kTimeoutMs = 10000;

static void FillMessageInfo(MessageInfo* message_info,

const std::string& message) {

@@ -64,7 +65,8 @@ class MockCastSocket : public CastSocket {

net::IPEndPoint ip_endpoint,

net::NetLog* net_log)

: CastSocket(kTestExtensionId, ip_endpoint,

- cast_channel::CHANNEL_AUTH_TYPE_SSL, delegate, net_log) {}

+ cast_channel::CHANNEL_AUTH_TYPE_SSL, delegate, net_log,

+ base::TimeDelta::FromMilliseconds(kTimeoutMs)) {}

virtual ~MockCastSocket() {}

virtual bool CalledOnValidThread() const OVERRIDE {