Reverting because I reverted the CL this depends on...

ppapi/tests/test_websocket.cc

 // Copyright (c) 2011 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 "ppapi/tests/test_websocket.h"
 
 #include <string.h>
 
-#include "ppapi/c/dev/ppb_testing_dev.h"
 #include "ppapi/c/dev/ppb_websocket_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/c/ppb_var.h"
 #include "ppapi/cpp/instance.h"
 #include "ppapi/cpp/module.h"
 #include "ppapi/tests/test_utils.h"
 #include "ppapi/tests/testing_instance.h"
@@ skipping 21 matching lines @@
 bool TestWebSocket::Init() {
   websocket_interface_ = static_cast<const PPB_WebSocket_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_WEBSOCKET_DEV_INTERFACE));
   var_interface_ = static_cast<const PPB_Var*>(
       pp::Module::Get()->GetBrowserInterface(PPB_VAR_INTERFACE));
   core_interface_ = static_cast<const PPB_Core*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CORE_INTERFACE));
   if (!websocket_interface_ || !var_interface_ || !core_interface_)
     return false;
 
-  return InitTestingInterface();
+  return true;
 }
 
 void TestWebSocket::RunTests(const std::string& filter) {
-  RUN_TEST_WITH_REFERENCE_CHECK(IsWebSocket, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(UninitializedPropertiesAccess, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(InvalidConnect, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(Protocols, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(GetURL, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(ValidConnect, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(InvalidClose, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(ValidClose, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(GetProtocol, filter);
-  RUN_TEST_WITH_REFERENCE_CHECK(TextSendReceive, filter);
+  RUN_TEST(IsWebSocket, filter);
+  RUN_TEST(UninitializedPropertiesAccess, filter);
+  RUN_TEST(InvalidConnect, filter);
+  RUN_TEST(Protocols, filter);
+  RUN_TEST(GetURL, filter);
+  RUN_TEST(ValidConnect, filter);
+  RUN_TEST(InvalidClose, filter);
+  RUN_TEST(ValidClose, filter);
+  RUN_TEST(GetProtocol, filter);
+  RUN_TEST(TextSendReceive, filter);
 }
 
 PP_Var TestWebSocket::CreateVar(const char* string) {
   return var_interface_->VarFromUtf8(string, strlen(string));
 }
 
 void TestWebSocket::ReleaseVar(const PP_Var& var) {
   var_interface_->Release(var);
 }
 
@@ skipping 57 matching lines @@
   ASSERT_TRUE(ws);
 
   uint64_t bufferedAmount = websocket_interface_->GetBufferedAmount(ws);
   ASSERT_EQ(0U, bufferedAmount);
 
   uint16_t close_code = websocket_interface_->GetCloseCode(ws);
   ASSERT_EQ(0U, close_code);
 
   PP_Var close_reason = websocket_interface_->GetCloseReason(ws);
   ASSERT_TRUE(AreEqual(close_reason, ""));
-  ReleaseVar(close_reason);
 
   PP_Bool close_was_clean = websocket_interface_->GetCloseWasClean(ws);
   ASSERT_EQ(PP_FALSE, close_was_clean);
 
   PP_Var extensions = websocket_interface_->GetExtensions(ws);
   ASSERT_TRUE(AreEqual(extensions, ""));
-  ReleaseVar(extensions);
 
   PP_Var protocol = websocket_interface_->GetProtocol(ws);
   ASSERT_TRUE(AreEqual(protocol, ""));
-  ReleaseVar(protocol);
 
   PP_WebSocketReadyState_Dev ready_state =
       websocket_interface_->GetReadyState(ws);
   ASSERT_EQ(PP_WEBSOCKETREADYSTATE_INVALID_DEV, ready_state);
 
   PP_Var url = websocket_interface_->GetURL(ws);
   ASSERT_TRUE(AreEqual(url, ""));
-  ReleaseVar(url);
-
-  core_interface_->ReleaseResource(ws);
 
   PASS();
 }
 
 std::string TestWebSocket::TestInvalidConnect() {
   PP_Var protocols[] = { PP_MakeUndefined() };
 
   PP_Resource ws = websocket_interface_->Create(instance_->pp_instance());
   ASSERT_TRUE(ws);
 
@@ skipping 233 matching lines @@
   PASS();
 }
 
 // TODO(toyoshim): Add tests for GetBufferedAmount().
 // For now, the function doesn't work fine because update callback in WebKit is
 // not landed yet.
 
 // TODO(toyoshim): Add tests for didReceiveMessageError().
 
 // TODO(toyoshim): Add other function tests.