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

Side by Side Diff: jingle/glue/proxy_resolving_client_socket_unittest.cc

Issue 1128793002: [jingle] Replace MessageLoopProxy usage with ThreadTaskRunnerHandle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Adding name to Authors file Created 5 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 | « AUTHORS ('k') | jingle/notifier/communicator/single_login_attempt_unittest.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 (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 "jingle/glue/proxy_resolving_client_socket.h" 5 #include "jingle/glue/proxy_resolving_client_socket.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/thread_task_runner_handle.h"
10 #include "net/base/test_completion_callback.h" 11 #include "net/base/test_completion_callback.h"
11 #include "net/dns/mock_host_resolver.h" 12 #include "net/dns/mock_host_resolver.h"
12 #include "net/proxy/proxy_service.h" 13 #include "net/proxy/proxy_service.h"
13 #include "net/socket/socket_test_util.h" 14 #include "net/socket/socket_test_util.h"
14 #include "net/url_request/url_request_context_getter.h" 15 #include "net/url_request/url_request_context_getter.h"
15 #include "net/url_request/url_request_test_util.h" 16 #include "net/url_request/url_request_test_util.h"
16 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
17 18
18 namespace { 19 namespace {
19 20
20 class MyTestURLRequestContext : public net::TestURLRequestContext { 21 class MyTestURLRequestContext : public net::TestURLRequestContext {
21 public: 22 public:
22 MyTestURLRequestContext() : TestURLRequestContext(true) { 23 MyTestURLRequestContext() : TestURLRequestContext(true) {
23 context_storage_.set_proxy_service( 24 context_storage_.set_proxy_service(
24 net::ProxyService::CreateFixedFromPacResult( 25 net::ProxyService::CreateFixedFromPacResult(
25 "PROXY bad:99; PROXY maybe:80; DIRECT")); 26 "PROXY bad:99; PROXY maybe:80; DIRECT"));
26 Init(); 27 Init();
27 } 28 }
28 ~MyTestURLRequestContext() override {} 29 ~MyTestURLRequestContext() override {}
29 }; 30 };
30 31
31 } // namespace 32 } // namespace
32 33
33 namespace jingle_glue { 34 namespace jingle_glue {
34 35
35 class ProxyResolvingClientSocketTest : public testing::Test { 36 class ProxyResolvingClientSocketTest : public testing::Test {
36 protected: 37 protected:
37 ProxyResolvingClientSocketTest() 38 ProxyResolvingClientSocketTest()
38 : url_request_context_getter_(new net::TestURLRequestContextGetter( 39 : url_request_context_getter_(new net::TestURLRequestContextGetter(
39 base::MessageLoopProxy::current(), 40 base::ThreadTaskRunnerHandle::Get(),
40 scoped_ptr<net::TestURLRequestContext>( 41 scoped_ptr<net::TestURLRequestContext>(
41 new MyTestURLRequestContext))) {} 42 new MyTestURLRequestContext))) {}
42 43
43 ~ProxyResolvingClientSocketTest() override {} 44 ~ProxyResolvingClientSocketTest() override {}
44 45
45 void TearDown() override { 46 void TearDown() override {
46 // Clear out any messages posted by ProxyResolvingClientSocket's 47 // Clear out any messages posted by ProxyResolvingClientSocket's
47 // destructor. 48 // destructor.
48 message_loop_.RunUntilIdle(); 49 message_loop_.RunUntilIdle();
49 } 50 }
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 const net::ProxyRetryInfoMap& retry_info = 110 const net::ProxyRetryInfoMap& retry_info =
110 context->proxy_service()->proxy_retry_info(); 111 context->proxy_service()->proxy_retry_info();
111 112
112 EXPECT_EQ(1u, retry_info.size()); 113 EXPECT_EQ(1u, retry_info.size());
113 net::ProxyRetryInfoMap::const_iterator iter = retry_info.find("bad:99"); 114 net::ProxyRetryInfoMap::const_iterator iter = retry_info.find("bad:99");
114 EXPECT_TRUE(iter != retry_info.end()); 115 EXPECT_TRUE(iter != retry_info.end());
115 } 116 }
116 117
117 // TODO(sanjeevr): Add more unit-tests. 118 // TODO(sanjeevr): Add more unit-tests.
118 } // namespace jingle_glue 119 } // namespace jingle_glue
OLDNEW
« no previous file with comments | « AUTHORS ('k') | jingle/notifier/communicator/single_login_attempt_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698