DevTools: Remove base/ dependencies from glue/devtools

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 34 matching lines @@
 // 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 "PlatformString.h"
 
-// TODO(darin): Remove these dependencies on Chromium base/.
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include <wtf/Noncopyable.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 WebCore::String& t) {
-    ALLOW_UNUSED bool success;
+    bool success;
     int i = t.toIntStrict(&success);
     ASSERT(success);
     return i;
   }
   static WebCore::String ToString(bool b) {
     return WebCore::String::number(b ? 1 : 0);
   }
 };
 
 template<>
 struct RpcTypeTrait<int> {
   typedef int ApiType;
   static int Parse(const WebCore::String& t) {
-    ALLOW_UNUSED bool success;
+    bool success;
     int i = t.toIntStrict(&success);
     ASSERT(success);
     return i;
   }
   static WebCore::String ToString(int i) {
     return WebCore::String::number(i);
   }
 };
 
 template<>
@@ skipping 156 matching lines @@
         TOOLS_RPC_DISPATCH2, \
         TOOLS_RPC_DISPATCH3) \
     return false; \
   } \
  private: \
   DISALLOW_COPY_AND_ASSIGN(Class##Dispatch); \
 };
 
 ///////////////////////////////////////////////////////
 // RPC base class
-class DevToolsRpc {
+class DevToolsRpc : public Noncopyable {
  public:
-  class Delegate {
+  class Delegate : public Noncopyable {
    public:
     Delegate() {}
     virtual ~Delegate() {}
     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_