[chromedriver] Logging tweaks and fixes.

chrome/test/chromedriver/session.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_CHROMEDRIVER_SESSION_H_
 #define CHROME_TEST_CHROMEDRIVER_SESSION_H_
 
 #include <list>
 #include <string>
 
@@ skipping 30 matching lines @@
   explicit Session(const std::string& id);
   Session(const std::string& id, scoped_ptr<Chrome> chrome);
   ~Session();
 
   Status GetTargetWindow(WebView** web_view);
 
   void SwitchToTopFrame();
   void SwitchToSubFrame(const std::string& frame_id,
                         const std::string& chromedriver_frame_id);
   std::string GetCurrentFrameId() const;
+  std::vector<WebDriverLog*> GetAllLogs() const;
 
   const std::string id;
   bool quit;
   bool detach;
   bool force_devtools_screenshot;
   scoped_ptr<Chrome> chrome;
   std::string window;
   int sticky_modifiers;
   // List of |FrameInfo|s for each frame to the current target frame from the
   // first frame element in the root document. If target frame is window.top,
   // this list will be empty.
   std::list<FrameInfo> frames;
   WebPoint mouse_position;
   base::TimeDelta implicit_wait;
   base::TimeDelta page_load_timeout;
   base::TimeDelta script_timeout;
   scoped_ptr<std::string> prompt_text;
   scoped_ptr<Geoposition> overridden_geoposition;
   // Logs that populate from DevTools events.
   ScopedVector<WebDriverLog> devtools_logs;
+  scoped_ptr<WebDriverLog> driver_log;
   base::ScopedTempDir temp_dir;
-  const scoped_ptr<base::DictionaryValue> capabilities;
-
- private:
-  scoped_ptr<base::DictionaryValue> CreateCapabilities();
+  scoped_ptr<base::DictionaryValue> capabilities;
 };
 
+Session* GetThreadLocalSession();
+
+void SetThreadLocalSession(scoped_ptr<Session> session);
+
 #endif  // CHROME_TEST_CHROMEDRIVER_SESSION_H_