Update test_shell LayoutTestController to support recently added boolean para...

webkit/tools/test_shell/layout_test_controller.cc

 // Copyright (c) 2010 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 1387 matching lines @@
 void LayoutTestController::forceRedSelectionColors(const CppArgumentList& args,
                                                    CppVariant* result) {
   result->SetNull();
   shell_->webView()->setSelectionColors(0xffee0000, 0xff00ee00, 0xff000000,
                                         0xffc0c0c0);
 }
 
 void LayoutTestController::addUserScript(const CppArgumentList& args,
                                          CppVariant* result) {
   result->SetNull();
-  if (args.size() < 2 || !args[0].isString() || !args[1].isBool())
+  if (args.size() < 3 || !args[0].isString() || !args[1].isBool() ||
+      !args[2].isBool())
     return;
-  shell_->webView()->addUserScript(WebString::fromUTF8(args[0].ToString()),
-                                   args[1].ToBoolean());
+  WebKit::WebView::addUserScript(
+      WebString::fromUTF8(args[0].ToString()),
+      WebKit::WebVector<WebString>(),
+      args[1].ToBoolean() ?
+          WebKit::WebView::UserScriptInjectAtDocumentStart :
+          WebKit::WebView::UserScriptInjectAtDocumentEnd,
+      args[2].ToBoolean() ?
+          WebKit::WebView::UserContentInjectInAllFrames :
+          WebKit::WebView::UserContentInjectInTopFrameOnly);
 }
 
 void LayoutTestController::addUserStyleSheet(const CppArgumentList& args,
                                              CppVariant* result) {
   result->SetNull();
-  if (args.size() < 1 || !args[0].isString())
+  if (args.size() < 2 || !args[0].isString() || !args[1].isBool())
     return;
-  shell_->webView()->addUserStyleSheet(WebString::fromUTF8(args[0].ToString()));
+  WebKit::WebView::addUserStyleSheet(
+      WebString::fromUTF8(args[0].ToString()),
+      WebKit::WebVector<WebString>(),
+      args[1].ToBoolean() ?
+          WebKit::WebView::UserContentInjectInAllFrames :
+          WebKit::WebView::UserContentInjectInTopFrameOnly,
+      WebKit::WebView::UserStyleInjectInExistingDocuments);
 }
 
 void LayoutTestController::setEditingBehavior(const CppArgumentList& args,
                                               CppVariant* result) {
   result->SetNull();
   WebString key = WebString::fromUTF8(args[0].ToString());
   if (key == "mac") {
     shell_->webView()->settings()->setEditingBehavior(
         WebKit::WebSettings::EditingBehaviorMac);
   } else if (key == "win") {
@@ skipping 49 matching lines @@
     return;
   WebKit::WebDeviceOrientation orientation(args[0].ToBoolean(),
                                            args[1].ToDouble(),
                                            args[2].ToBoolean(),
                                            args[3].ToDouble(),
                                            args[4].ToBoolean(),
                                            args[5].ToDouble());
 
   shell_->device_orientation_client_mock()->setOrientation(orientation);
 }