Revert 144610 (speculative; possibly caused http://crbug.com/135059)

chrome/test/pyautolib/pyautolib.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.
 //
 // This file declares the C++ side of PyAuto, the python interface to
 // Chromium automation.  It access Chromium's internals using Automation Proxy.
 
 #ifndef CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
 #define CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/test/test_timeouts.h"
-#include "base/time.h"
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui/ui_test_suite.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 class AutomationProxy;
 
 // The C++ style guide forbids using default arguments but I'm taking the
@@ skipping 179 matching lines @@
     return TestTimeouts::large_test_timeout_ms();
   }
 
  protected:
   // Gets the automation proxy and checks that it exists.
   virtual AutomationProxy* automation() const OVERRIDE;
 
   virtual void SetLaunchSwitches() OVERRIDE;
 
  private:
-  // Create JSON error responses.
-  void ErrorResponse(const std::string& error_string,
-                     const std::string& request,
-                     std::string* response);
-  void RequestFailureResponse(
-      const std::string& request,
-      const base::TimeDelta& duration,
-      const base::TimeDelta& timeout,
-      std::string* response);
-
   // Gets the current state of the bookmark bar. Returns false if it failed.
   bool GetBookmarkBarState(bool* visible, bool* detached, int window_index = 0);
 
   // Enables PostTask to main thread.
   // Should be shared across multiple instances of PyUITestBase so that this
   // class is re-entrant and multiple instances can be created.
   // This is necessary since python's unittest module creates instances of
   // TestCase at load time itself.
   static MessageLoop* GetSharedMessageLoop(MessageLoop::Type msg_loop_type);
   static MessageLoop* message_loop_;
 
   // Path to named channel id.
   std::string named_channel_id_;
 };
 
 #endif  // CHROME_TEST_PYAUTOLIB_PYAUTOLIB_H_