Switch WebUITestHandler to use ExecuteJavascriptInWebFrameCallbackResult.

chrome/browser/ui/webui/web_ui_test_handler.h

 // Copyright (c) 2011 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_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_
 
 #include "base/compiler_specific.h"
 #include "base/string16.h"
-#include "content/public/browser/notification_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 
 namespace base {
 class ListValue;
+class Value;
 }
 
 namespace content {
 class RenderViewHost;
 }
 
 // This class registers test framework specific handlers on WebUI objects.
-class WebUITestHandler : public content::WebUIMessageHandler,
-                         public content::NotificationObserver {
+class WebUITestHandler : public content::WebUIMessageHandler {
  public:
   WebUITestHandler();
 
   // Sends a message through |preload_host| with the |js_text| to preload at the
   // appropriate time before the onload call is made.
   void PreloadJavaScript(const string16& js_text,
                          content::RenderViewHost* preload_host);
 
   // Runs |js_text| in this object's WebUI frame. Does not wait for any result.
   void RunJavaScript(const string16& js_text);
 
   // Runs |js_text| in this object's WebUI frame. Waits for result, logging an
   // error message on failure. Returns test pass/fail.
   bool RunJavaScriptTestWithResult(const string16& js_text);
 
   // WebUIMessageHandler overrides.
   // Add test handlers to the current WebUI object.
   virtual void RegisterMessages() OVERRIDE;
 
  private:
   // Receives testResult messages.
   void HandleTestResult(const base::ListValue* test_result);
 
-  // From content::NotificationObserver.
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // Gets the callback that Javascript execution is complete.
+  void JavaScriptComplete(const base::Value* result);
 
   // Runs a message loop until test finishes. Returns the result of the
   // test.
   bool WaitForResult();
 
   // Received test pass/fail;
   bool test_done_;
 
   // Pass fail result of current test.
   bool test_succeeded_;
 
   // Test code finished trying to execute. This will be set to true when the
   // selected tab is done with this execution request whether it was able to
   // parse/execute the javascript or not.
   bool run_test_done_;
 
   // Test code was able to execute successfully. This is *NOT* the test
   // pass/fail.
   bool run_test_succeeded_;
 
   // Waiting for a test to finish.
   bool is_waiting_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUITestHandler);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_WEB_UI_TEST_HANDLER_H_