DevTools: pass class and method name as arguments to RPC messages

webkit/glue/devtools/devtools_rpc_unittest.cc

 // 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.
 #include "PlatformString.h"
 #undef LOG
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/devtools/devtools_mock_rpc.h"
 #include "webkit/glue/devtools/devtools_rpc.h"
 
@@ skipping 34 matching lines @@
 
  protected:
   virtual void SetUp() {}
   virtual void TearDown() {}
 };
 
 // Tests method call serialization.
 TEST_F(DevToolsRpcTests, TestSerialize) {
   MockTestRpcClass mock;
   mock.Method0();
-  EXPECT_EQ("[\"TestRpcClass\",\"Method0\"]", mock.get_log());
+  EXPECT_EQ("TestRpcClass", mock.last_class_name());
+  EXPECT_EQ("Method0", mock.last_method_name());
+  EXPECT_EQ("[]", mock.last_msg());
   mock.Reset();
 
   mock.Method1(10);
-  EXPECT_EQ("[\"TestRpcClass\",\"Method1\",10]", mock.get_log());
+  EXPECT_EQ("TestRpcClass", mock.last_class_name());
+  EXPECT_EQ("Method1", mock.last_method_name());
+  EXPECT_EQ("[10]", mock.last_msg());
   mock.Reset();
 
   mock.Method2(20, "foo");
-  EXPECT_EQ("[\"TestRpcClass\",\"Method2\",20,\"foo\"]", mock.get_log());
+  EXPECT_EQ("TestRpcClass", mock.last_class_name());
+  EXPECT_EQ("Method2", mock.last_method_name());
+  EXPECT_EQ("[20,\"foo\"]", mock.last_msg());
   mock.Reset();
 
   StringValue value("bar");
   mock.Method3(30, "foo", value);
-  EXPECT_EQ("[\"TestRpcClass\",\"Method3\",30,\"foo\",\"bar\"]",
-      mock.get_log());
+  EXPECT_EQ("TestRpcClass", mock.last_class_name());
+  EXPECT_EQ("Method3", mock.last_method_name());
+  EXPECT_EQ("[30,\"foo\",\"bar\"]", mock.last_msg());
   mock.Reset();
 }
 
 // Tests method call dispatch.
 TEST_F(DevToolsRpcTests, TestDispatch) {
   MockTestRpcClass local;
   MockTestRpcClass remote;
 
   // Call 1.
   local.Reset();
   local.Method0();
   remote.Reset();
   remote.Method0();
   remote.Replay();
 
-  TestRpcClassDispatch::Dispatch(&remote, local.get_log());
+  TestRpcClassDispatch::Dispatch(&remote, local.last_class_name(),
+                                 local.last_method_name(), local.last_msg());
   remote.Verify();
 
   // Call 2.
   local.Reset();
   local.Method1(10);
   remote.Reset();
   remote.Method1(10);
   remote.Replay();
-  TestRpcClassDispatch::Dispatch(&remote, local.get_log());
+  TestRpcClassDispatch::Dispatch(&remote, local.last_class_name(),
+                                 local.last_method_name(), local.last_msg());
   remote.Verify();
 
   // Call 3.
   local.Reset();
   remote.Reset();
   local.Method2(20, "foo");
   remote.Method2(20, "foo");
 
   remote.Replay();
-  TestRpcClassDispatch::Dispatch(&remote, local.get_log());
+  TestRpcClassDispatch::Dispatch(&remote, local.last_class_name(),
+                                 local.last_method_name(), local.last_msg());
   remote.Verify();
 
   // Call 4.
   local.Reset();
   remote.Reset();
   StringValue value("bar");
   local.Method3(30, "foo", value);
   remote.Method3(30, "foo", value);
 
   remote.Replay();
-  TestRpcClassDispatch::Dispatch(&remote, local.get_log());
+  TestRpcClassDispatch::Dispatch(&remote, local.last_class_name(),
+                                 local.last_method_name(), local.last_msg());
   remote.Verify();
 }
 
 }  // namespace