Remove some tests that are now living upstream, and eliminate

some usage of glue_util.h.

R=yaar
BUG=none
TEST=none

Review URL: http://codereview.chromium.org/572013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38180 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 85 deletions

diff --git a/webkit/glue/devtools/devtools_message_data.cc b/webkit/glue/devtools/devtools_message_data.cc
index d586d5cb..12e2064 100644
--- a/webkit/glue/devtools/devtools_message_data.cc
+++ b/webkit/glue/devtools/devtools_message_data.cc
@@ -1,58 +1,32 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// 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.
 
-#include "config.h"
-
-#undef LOG
+#include "webkit/glue/devtools/devtools_message_data.h"
 
+#include "third_party/WebKit/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDevToolsMessageData.h"
-#include "webkit/glue/devtools/devtools_message_data.h"
-#include "webkit/glue/glue_util.h"
 
-DevToolsMessageData::DevToolsMessageData(const WebKit::WebDevToolsMessageData& data)
-    : class_name(webkit_glue::WebStringToStdString(data.className))
-    , method_name(webkit_glue::WebStringToStdString(data.methodName))
+using WebKit::WebDevToolsMessageData;
+using WebKit::WebString;
+using WebKit::WebVector;
+
+DevToolsMessageData::DevToolsMessageData(const WebDevToolsMessageData& data)
+    : class_name(data.className.utf8())
+    , method_name(data.methodName.utf8())
 {
-    for (size_t i = 0; i < data.arguments.size(); i++)
-        arguments.push_back(webkit_glue::WebStringToStdString(data.arguments[i]));
+  for (size_t i = 0; i < data.arguments.size(); i++)
+    arguments.push_back(data.arguments[i].utf8());
 }
 
-WebKit::WebDevToolsMessageData DevToolsMessageData::ToWebDevToolsMessageData() const
+WebDevToolsMessageData DevToolsMessageData::ToWebDevToolsMessageData() const
 {
-    WebKit::WebDevToolsMessageData result;
-    result.className = webkit_glue::StdStringToWebString(class_name);
-    result.methodName = webkit_glue::StdStringToWebString(method_name);
-    WebKit::WebVector<WebKit::WebString> web_args(arguments.size());
-    for (size_t i = 0; i < arguments.size(); i++)
-        web_args[i] = webkit_glue::StdStringToWebString(arguments[i]);
-    result.arguments.swap(web_args);
-    return result;
+  WebDevToolsMessageData result;
+  result.className = WebString::fromUTF8(class_name);
+  result.methodName = WebString::fromUTF8(method_name);
+  WebVector<WebString> web_args(arguments.size());
+  for (size_t i = 0; i < arguments.size(); i++)
+    web_args[i] = WebString::fromUTF8(arguments[i]);
+  result.arguments.swap(web_args);
+  return result;
 }
-
diff --git a/webkit/glue/devtools/devtools_message_data.h b/webkit/glue/devtools/devtools_message_data.h
index be99c59..7fc7095 100644
--- a/webkit/glue/devtools/devtools_message_data.h
+++ b/webkit/glue/devtools/devtools_message_data.h
@@ -1,32 +1,6 @@
-/*
- * 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
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+// 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.
 
 #ifndef WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_
 #define WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_
@@ -35,17 +9,17 @@
 #include <vector>
 
 namespace WebKit {
-    struct WebDevToolsMessageData;
+struct WebDevToolsMessageData;
 }
 
 struct DevToolsMessageData {
-    DevToolsMessageData() {}
-    explicit DevToolsMessageData(const WebKit::WebDevToolsMessageData&);
-    WebKit::WebDevToolsMessageData ToWebDevToolsMessageData() const;
+  DevToolsMessageData() {}
+  explicit DevToolsMessageData(const WebKit::WebDevToolsMessageData&);
+  WebKit::WebDevToolsMessageData ToWebDevToolsMessageData() const;
 
-    std::string class_name;
-    std::string method_name;
-    std::vector<std::string> arguments;
+  std::string class_name;
+  std::string method_name;
+  std::vector<std::string> arguments;
 };
 
 #endif  // WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_MESSAGE_DATA_H_