Index: chrome/test/chromedriver/session.h |
diff --git a/chrome/test/chromedriver/session.h b/chrome/test/chromedriver/session.h |
index 8b2ac53e0cef51de374bb1b52c6e7fbd1007d65f..40ec9e94383ff7ba008f18c2f3ad7c556dd3a326 100644 |
--- a/chrome/test/chromedriver/session.h |
+++ b/chrome/test/chromedriver/session.h |
@@ -10,11 +10,8 @@ |
#include "base/basictypes.h" |
#include "base/files/scoped_temp_dir.h" |
-#include "base/memory/ref_counted.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
-#include "base/synchronization/lock.h" |
-#include "base/threading/thread.h" |
#include "chrome/test/chromedriver/basic_types.h" |
#include "chrome/test/chromedriver/chrome/geoposition.h" |
@@ -52,7 +49,7 @@ struct Session { |
std::string GetCurrentFrameId() const; |
const std::string id; |
- base::Thread thread; |
+ bool quit; |
bool detach; |
scoped_ptr<Chrome> chrome; |
std::string window; |
@@ -76,32 +73,4 @@ struct Session { |
scoped_ptr<base::DictionaryValue> CreateCapabilities(); |
}; |
-class SessionAccessor : public base::RefCountedThreadSafe<SessionAccessor> { |
- public: |
- virtual Session* Access(scoped_ptr<base::AutoLock>* lock) = 0; |
- |
- // The session should be accessed before its deletion. |
- virtual void DeleteSession() = 0; |
- |
- protected: |
- friend class base::RefCountedThreadSafe<SessionAccessor>; |
- virtual ~SessionAccessor() {} |
-}; |
- |
-class SessionAccessorImpl : public SessionAccessor { |
- public: |
- explicit SessionAccessorImpl(scoped_ptr<Session> session); |
- |
- virtual Session* Access(scoped_ptr<base::AutoLock>* lock) OVERRIDE; |
- virtual void DeleteSession() OVERRIDE; |
- |
- private: |
- virtual ~SessionAccessorImpl(); |
- |
- base::Lock session_lock_; |
- scoped_ptr<Session> session_; |
- |
- DISALLOW_COPY_AND_ASSIGN(SessionAccessorImpl); |
-}; |
- |
#endif // CHROME_TEST_CHROMEDRIVER_SESSION_H_ |