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

Side by Side Diff: chrome/browser/extensions/api/socket/socket_apitest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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/stringprintf.h" 6 #include "base/stringprintf.h"
7 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h" 7 #include "chrome/browser/extensions/api/dns/host_resolver_wrapper.h"
8 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h" 8 #include "chrome/browser/extensions/api/dns/mock_host_resolver_creator.h"
9 #include "chrome/browser/extensions/api/socket/socket_api.h" 9 #include "chrome/browser/extensions/api/socket/socket_api.h"
10 #include "chrome/browser/extensions/extension_apitest.h" 10 #include "chrome/browser/extensions/extension_apitest.h"
11 #include "chrome/browser/extensions/extension_function_test_utils.h" 11 #include "chrome/browser/extensions/extension_function_test_utils.h"
12 #include "chrome/browser/extensions/extension_service.h" 12 #include "chrome/browser/extensions/extension_service.h"
13 #include "chrome/browser/extensions/extension_test_message_listener.h" 13 #include "chrome/browser/extensions/extension_test_message_listener.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/common/chrome_switches.h" 15 #include "chrome/common/chrome_switches.h"
16 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
17 #include "chrome/test/base/ui_test_utils.h" 17 #include "chrome/test/base/ui_test_utils.h"
18 #include "net/base/mock_host_resolver.h" 18 #include "net/dns/mock_host_resolver.h"
19 #include "net/test/test_server.h" 19 #include "net/test/test_server.h"
20 20
21 using extensions::Extension; 21 using extensions::Extension;
22 22
23 namespace utils = extension_function_test_utils; 23 namespace utils = extension_function_test_utils;
24 24
25 namespace { 25 namespace {
26 26
27 const std::string kHostname = "127.0.0.1"; 27 const std::string kHostname = "127.0.0.1";
28 const int kPort = 8888; 28 const int kPort = 8888;
(...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 LoadExtension(test_data_dir_.AppendASCII("socket/unload")); 192 LoadExtension(test_data_dir_.AppendASCII("socket/unload"));
193 ASSERT_TRUE(extension); 193 ASSERT_TRUE(extension);
194 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 194 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
195 195
196 UnloadExtension(extension->id()); 196 UnloadExtension(extension->id());
197 197
198 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/unload"))) 198 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("socket/unload")))
199 << message_; 199 << message_;
200 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); 200 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
201 } 201 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698