OLD | NEW |
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/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/common/chrome_paths.h" | 10 #include "chrome/common/chrome_paths.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 const std::string kHostname = "127.0.0.1"; | 26 const std::string kHostname = "127.0.0.1"; |
27 const int kPort = 8888; | 27 const int kPort = 8888; |
28 | 28 |
29 class SocketApiTest : public ExtensionApiTest { | 29 class SocketApiTest : public ExtensionApiTest { |
30 public: | 30 public: |
31 SocketApiTest() : resolver_event_(true, false), | 31 SocketApiTest() : resolver_event_(true, false), |
32 resolver_creator_( | 32 resolver_creator_( |
33 new extensions::MockHostResolverCreator()) { | 33 new extensions::MockHostResolverCreator()) { |
34 } | 34 } |
35 | 35 |
36 virtual void SetUpOnMainThread() OVERRIDE { | 36 virtual void SetUpOnMainThread() override { |
37 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( | 37 extensions::HostResolverWrapper::GetInstance()->SetHostResolverForTesting( |
38 resolver_creator_->CreateMockHostResolver()); | 38 resolver_creator_->CreateMockHostResolver()); |
39 } | 39 } |
40 | 40 |
41 virtual void TearDownOnMainThread() OVERRIDE { | 41 virtual void TearDownOnMainThread() override { |
42 extensions::HostResolverWrapper::GetInstance()-> | 42 extensions::HostResolverWrapper::GetInstance()-> |
43 SetHostResolverForTesting(NULL); | 43 SetHostResolverForTesting(NULL); |
44 resolver_creator_->DeleteMockHostResolver(); | 44 resolver_creator_->DeleteMockHostResolver(); |
45 } | 45 } |
46 | 46 |
47 private: | 47 private: |
48 base::WaitableEvent resolver_event_; | 48 base::WaitableEvent resolver_event_; |
49 | 49 |
50 // The MockHostResolver asserts that it's used on the same thread on which | 50 // The MockHostResolver asserts that it's used on the same thread on which |
51 // it's created, which is actually a stronger rule than its real counterpart. | 51 // it's created, which is actually a stronger rule than its real counterpart. |
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 ResultCatcher catcher; | 141 ResultCatcher catcher; |
142 catcher.RestrictToBrowserContext(browser()->profile()); | 142 catcher.RestrictToBrowserContext(browser()->profile()); |
143 ExtensionTestMessageListener listener("info_please", true); | 143 ExtensionTestMessageListener listener("info_please", true); |
144 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api"))); | 144 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/api"))); |
145 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 145 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
146 listener.Reply( | 146 listener.Reply( |
147 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort)); | 147 base::StringPrintf("multicast:%s:%d", kHostname.c_str(), kPort)); |
148 | 148 |
149 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 149 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
150 } | 150 } |
OLD | NEW |