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

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

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Unified patch updating all references to the new base/synchronization/lock.h 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/sync/engine/mock_connection_manager.cc ('k') | ipc/ipc_channel_posix.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 #ifndef CHROME_TEST_WEBDRIVER_SESSION_MANAGER_H_ 5 #ifndef CHROME_TEST_WEBDRIVER_SESSION_MANAGER_H_
6 #define CHROME_TEST_WEBDRIVER_SESSION_MANAGER_H_ 6 #define CHROME_TEST_WEBDRIVER_SESSION_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 10
(...skipping 22 matching lines...) Expand all
33 33
34 Session* GetSession(const std::string& id) const; 34 Session* GetSession(const std::string& id) const;
35 35
36 private: 36 private:
37 SessionManager() : addr_(""), port_(""), count_(0) {} 37 SessionManager() : addr_(""), port_(""), count_(0) {}
38 friend struct DefaultSingletonTraits<SessionManager>; 38 friend struct DefaultSingletonTraits<SessionManager>;
39 std::string GenerateSessionID(); 39 std::string GenerateSessionID();
40 std::string IPLookup(const std::string& nic); 40 std::string IPLookup(const std::string& nic);
41 41
42 std::map<std::string, Session*> map_; 42 std::map<std::string, Session*> map_;
43 Lock session_generation_; 43 base::Lock session_generation_;
44 // Record the address and port for the HTTP 303 See other redirect. 44 // Record the address and port for the HTTP 303 See other redirect.
45 // We save the IP and Port of the machine chromedriver is running on since 45 // We save the IP and Port of the machine chromedriver is running on since
46 // a HTTP 303, see other, resdirect is sent after a successful creation of 46 // a HTTP 303, see other, resdirect is sent after a successful creation of
47 // a session, ie: http://172.22.41.105:8080/session/DFSSE453CV588 47 // a session, ie: http://172.22.41.105:8080/session/DFSSE453CV588
48 std::string addr_; 48 std::string addr_;
49 std::string port_; 49 std::string port_;
50 int count_; 50 int count_;
51 51
52 DISALLOW_COPY_AND_ASSIGN(SessionManager); 52 DISALLOW_COPY_AND_ASSIGN(SessionManager);
53 }; 53 };
54 54
55 } // namespace webdriver 55 } // namespace webdriver
56 56
57 #endif // CHROME_TEST_WEBDRIVER_SESSION_MANAGER_H_ 57 #endif // CHROME_TEST_WEBDRIVER_SESSION_MANAGER_H_
58 58
OLDNEW
« no previous file with comments | « chrome/test/sync/engine/mock_connection_manager.cc ('k') | ipc/ipc_channel_posix.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698