Merge 140539

Tools/DumpRenderTree/chromium/DRTDevToolsClient.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 42 matching lines @@
     virtual ~DRTDevToolsClient();
     void reset();
 
     // WebDevToolsFrontendClient implementation
     virtual void sendMessageToBackend(const WebKit::WebString&);
 
     virtual void activateWindow();
     virtual void closeWindow();
     virtual void dockWindow();
     virtual void undockWindow();
+    virtual bool isUnderTest();
 
     void asyncCall(const WebKit::WebString& args);
 
     void allMessagesProcessed();
     WebTestRunner::WebTaskList* taskList() { return &m_taskList; }
 
  private:
     void call(const WebKit::WebString& args);
     class AsyncCallTask: public WebTestRunner::WebMethodTask<DRTDevToolsClient> {
     public:
         AsyncCallTask(DRTDevToolsClient* object, const WebKit::WebString& args)
             : WebTestRunner::WebMethodTask<DRTDevToolsClient>(object), m_args(args) { }
         virtual void runIfValid() { m_object->call(m_args); }
 
     private:
         WebKit::WebString m_args;
     };
 
     WebTestRunner::WebTaskList m_taskList;
     WebKit::WebView* m_webView;
     DRTDevToolsAgent* m_drtDevToolsAgent;
     WTF::OwnPtr<WebKit::WebDevToolsFrontend> m_webDevToolsFrontend;
 };
 
 #endif // DRTDevToolsClient_h