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

Side by Side Diff: chrome/test/webdriver/session_manager.cc

Issue 6086003: Cleanup: Remove unneeded includes of chrome_switches.h. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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
« no previous file with comments | « chrome/test/webdriver/commands/webdriver_command.cc ('k') | chrome/utility/utility_main.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/test/webdriver/session_manager.h" 5 #include "chrome/test/webdriver/session_manager.h"
6 6
7 #ifdef OS_POSIX
8 #include <netdb.h>
9 #include <unistd.h>
10 #include <arpa/inet.h>
11 #include <net/if.h>
12 #include <sys/ioctl.h>
13 #include <sys/socket.h>
14 #include <sys/types.h>
15 #elif OS_WIN
16 #include <Shellapi.h>
17 #include <Winsock2.h>
18 #endif
19
20 #include "base/command_line.h" 7 #include "base/command_line.h"
21 #include "base/logging.h" 8 #include "base/logging.h"
22 #include "base/process.h" 9 #include "base/process.h"
23 #include "base/process_util.h" 10 #include "base/process_util.h"
24 #include "base/ref_counted.h" 11 #include "base/ref_counted.h"
25 #include "base/scoped_ptr.h" 12 #include "base/scoped_ptr.h"
26 #include "base/test/test_timeouts.h" 13 #include "base/test/test_timeouts.h"
14 #include "chrome/common/chrome_constants.h"
27 15
28 #include "chrome/common/chrome_constants.h" 16 #if defined(OS_POSIX)
29 #include "chrome/common/chrome_switches.h" 17 #include <arpa/inet.h>
18 #include <net/if.h>
19 #include <netdb.h>
20 #include <sys/ioctl.h>
21 #include <sys/socket.h>
22 #include <sys/types.h>
23 #include <unistd.h>
24 #elif defined(OS_WIN)
25 #include <Shellapi.h>
26 #include <Winsock2.h>
27 #endif
30 28
31 namespace webdriver { 29 namespace webdriver {
32 30
33 std::string SessionManager::GetIPAddress() { 31 std::string SessionManager::GetIPAddress() {
34 return std::string(addr_) + std::string(":") + port_; 32 return std::string(addr_) + std::string(":") + port_;
35 } 33 }
36 34
37 std::string SessionManager::IPLookup(const std::string& nic) { 35 std::string SessionManager::IPLookup(const std::string& nic) {
38 #ifdef OS_POSIX 36 #ifdef OS_POSIX
39 int socket_conn; 37 int socket_conn;
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 180 }
183 return it->second; 181 return it->second;
184 } 182 }
185 183
186 // static 184 // static
187 SessionManager* SessionManager::GetInstance() { 185 SessionManager* SessionManager::GetInstance() {
188 return Singleton<SessionManager>::get(); 186 return Singleton<SessionManager>::get();
189 } 187 }
190 188
191 } // namespace webdriver 189 } // namespace webdriver
OLDNEW
« no previous file with comments | « chrome/test/webdriver/commands/webdriver_command.cc ('k') | chrome/utility/utility_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698