Convert devtools interfaces over to using WebString....

webkit/glue/devtools/devtools_rpc.h

 // Copyright (c) 2009 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.
 
 // DevTools RPC subsystem is a simple string serialization-based rpc
 // implementation. The client is responsible for defining the Rpc-enabled
 // interface in terms of its macros:
 //
 // #define MYAPI_STRUCT(METHOD0, METHOD1, METHOD2, METHOD3)
 //   METHOD0(Method1)
@@ skipping 32 matching lines @@
 // calls to the underlying MyApi methods:
 //
 // MyApi* real_object;
 // MyApiDispatch::Dispatch(real_object, raw_string_call_generated_by_stub);
 //
 // will make corresponding calls to the real object.
 
 #ifndef WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_RPC_H_
 #define WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_RPC_H_
 
-#include <string>
+#include "PlatformString.h"
 
-// Do not remove this one although it is not used.
-#include <wtf/OwnPtr.h>
-
+// TODO(darin): Remove these dependencies on Chromium base/.
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/string_util.h"
-#include "webkit/glue/glue_util.h"
 
 namespace WebCore {
 class String;
 }
 
 using WebCore::String;
 
 ///////////////////////////////////////////////////////
 // RPC dispatch macro
 
 template<typename T>
 struct RpcTypeTrait {
   typedef T ApiType;
 };
 
 template<>
 struct RpcTypeTrait<bool> {
   typedef bool ApiType;
-  static bool Parse(const std::string& t) {
-    int i;
-    ALLOW_UNUSED bool success = StringToInt(t, &i);
+  static bool Parse(const WebCore::String& t) {
+    ALLOW_UNUSED bool success;
+    int i = t.toIntStrict(&success);
     ASSERT(success);
     return i;
   }
-  static std::string ToString(bool b) {
-    return IntToString(b ? 1 : 0);
+  static WebCore::String ToString(bool b) {
+    return WebCore::String::number(b ? 1 : 0);
   }
 };
 
 template<>
 struct RpcTypeTrait<int> {
   typedef int ApiType;
-  static int Parse(const std::string& t) {
-    int i;
-    ALLOW_UNUSED bool success = StringToInt(t, &i);
+  static int Parse(const WebCore::String& t) {
+    ALLOW_UNUSED bool success;
+    int i = t.toIntStrict(&success);
     ASSERT(success);
     return i;
   }
-  static std::string ToString(int i) {
-    return IntToString(i);
+  static WebCore::String ToString(int i) {
+    return WebCore::String::number(i);
   }
 };
 
 template<>
 struct RpcTypeTrait<String> {
   typedef const String& ApiType;
-  static String Parse(const std::string& t) {
-    return webkit_glue::StdStringToString(t);
+  static String Parse(const WebCore::String& t) {
+    return t;
   }
-  static std::string ToString(const String& t) {
-    return webkit_glue::StringToStdString(t);
-  }
-};
-
-template<>
-struct RpcTypeTrait<std::string> {
-  typedef const std::string& ApiType;
-  static std::string Parse(const std::string& s) {
-    return s;
-  }
-  static std::string ToString(const std::string& s) {
-    return s;
+  static WebCore::String ToString(const String& t) {
+    return t;
   }
 };
 
 ///////////////////////////////////////////////////////
 // RPC Api method declarations
 
 #define TOOLS_RPC_API_METHOD0(Method) \
   virtual void Method() = 0;
 
 #define TOOLS_RPC_API_METHOD1(Method, T1) \
@@ skipping 92 matching lines @@
   Class() { \
     class_name = #Class; \
   } \
   ~Class() {} \
   \
   STRUCT( \
       TOOLS_RPC_API_METHOD0, \
       TOOLS_RPC_API_METHOD1, \
       TOOLS_RPC_API_METHOD2, \
       TOOLS_RPC_API_METHOD3) \
-  std::string class_name; \
+  WebCore::String class_name; \
  private: \
   DISALLOW_COPY_AND_ASSIGN(Class); \
 }; \
 \
 class Class##Stub : public Class, public DevToolsRpc { \
  public: \
   explicit Class##Stub(Delegate* delegate) : DevToolsRpc(delegate) {} \
   virtual ~Class##Stub() {} \
   typedef Class CLASS; \
   STRUCT( \
       TOOLS_RPC_STUB_METHOD0, \
       TOOLS_RPC_STUB_METHOD1, \
       TOOLS_RPC_STUB_METHOD2, \
       TOOLS_RPC_STUB_METHOD3) \
  private: \
   DISALLOW_COPY_AND_ASSIGN(Class##Stub); \
 }; \
 \
 class Class##Dispatch { \
  public: \
   Class##Dispatch() {} \
   virtual ~Class##Dispatch() {} \
   \
   static bool Dispatch(Class* delegate, \
-                       const std::string& class_name, \
-                       const std::string& method_name, \
-                       const std::string& p1, \
-                       const std::string& p2, \
-                       const std::string& p3) { \
+                       const WebCore::String& class_name, \
+                       const WebCore::String& method_name, \
+                       const WebCore::String& p1, \
+                       const WebCore::String& p2, \
+                       const WebCore::String& p3) { \
     if (class_name != #Class) { \
       return false; \
     } \
     typedef Class CLASS; \
     STRUCT( \
         TOOLS_RPC_DISPATCH0, \
         TOOLS_RPC_DISPATCH1, \
         TOOLS_RPC_DISPATCH2, \
         TOOLS_RPC_DISPATCH3) \
     return false; \
   } \
  private: \
   DISALLOW_COPY_AND_ASSIGN(Class##Dispatch); \
 };
 
 ///////////////////////////////////////////////////////
 // RPC base class
 class DevToolsRpc {
  public:
   class Delegate {
    public:
     Delegate() {}
     virtual ~Delegate() {}
-    virtual void SendRpcMessage(const std::string& class_name,
-                                const std::string& method_name,
-                                const std::string& p1 = "",
-                                const std::string& p2 = "",
-                                const std::string& p3 = "") = 0;
+    virtual void SendRpcMessage(const WebCore::String& class_name,
+                                const WebCore::String& method_name,
+                                const WebCore::String& p1 = "",
+                                const WebCore::String& p2 = "",
+                                const WebCore::String& p3 = "") = 0;
    private:
     DISALLOW_COPY_AND_ASSIGN(Delegate);
   };
 
   explicit DevToolsRpc(Delegate* delegate)
       : delegate_(delegate) {}
   virtual ~DevToolsRpc() {};
 
  protected:
   Delegate* delegate_;
  private:
   DISALLOW_COPY_AND_ASSIGN(DevToolsRpc);
 };
 
 #endif  // WEBKIT_GLUE_DEVTOOLS_DEVTOOLS_RPC_H_