Reverting 11396.

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2006-2008 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 contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
@@ skipping 171 matching lines @@
 
 void LayoutTestController::WorkQueue::AddWork(WorkItem* work) {
   if (frozen_) {
     delete work;
     return;
   }
   queue_.push(work);
 }
 
 void LayoutTestController::dumpAsText(const CppArgumentList& args,
-                                      CppVariant* result) {
+                                                   CppVariant* result) {
   dump_as_text_ = true;
   result->SetNull();
 }
 
 void LayoutTestController::dumpEditingCallbacks(
     const CppArgumentList& args, CppVariant* result) {
   dump_editing_callbacks_ = true;
   result->SetNull();
 }
 
@@ skipping 69 matching lines @@
   if (shell_->layout_test_mode() && wait_until_done_ &&
       !shell_->delegate()->top_loading_frame() && work_queue_.empty()) {
     shell_->TestFinished();
   }
   wait_until_done_ = false;
   result->SetNull();
 }
 
 class WorkItemBackForward : public LayoutTestController::WorkItem {
  public:
-  explicit WorkItemBackForward(int distance) : distance_(distance) {}
+  WorkItemBackForward(int distance) : distance_(distance) {}
   void Run(TestShell* shell) {
     shell->GoBackOrForward(distance_);
   }
  private:
   int distance_;
 };
 
 void LayoutTestController::queueBackNavigation(
     const CppArgumentList& args, CppVariant* result) {
   if (args.size() > 0 && args[0].isNumber())
@@ skipping 16 matching lines @@
 };
 
 void LayoutTestController::queueReload(
     const CppArgumentList& args, CppVariant* result) {
   work_queue_.AddWork(new WorkItemReload);
   result->SetNull();
 }
 
 class WorkItemScript : public LayoutTestController::WorkItem {
  public:
-  explicit WorkItemScript(const string& script) : script_(script) {}
+  WorkItemScript(const string& script) : script_(script) {}
   void Run(TestShell* shell) {
     wstring url = L"javascript:" + UTF8ToWide(script_);
     shell->LoadURL(url.c_str());
   }
  private:
   string script_;
 };
 
 void LayoutTestController::queueScript(
     const CppArgumentList& args, CppVariant* result) {
@@ skipping 326 matching lines @@
   result->SetNull();
 }
 
 void LayoutTestController::dumpSelectionRect(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }
 
 void LayoutTestController::display(
     const CppArgumentList& args, CppVariant* result) {
-  shell_->webViewHost()->DisplayForRepaint();
   result->SetNull();
 }
 
 void LayoutTestController::testRepaint(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
 }
 
 void LayoutTestController::repaintSweepHorizontally(
     const CppArgumentList& args, CppVariant* result) {
@@ skipping 40 matching lines @@
 void LayoutTestController::fallbackMethod(
     const CppArgumentList& args, CppVariant* result) {
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
     logging::LogMessage("CONSOLE:", 0).stream() << message;
   } else {
     printf("CONSOLE MESSAGE: %S\n", message.c_str());
   }
   result->SetNull();
 }