Revert 91859 - Porting ppapi_tests framework to postMessage.

ppapi/tests/testing_instance.h

 // 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.
 
 #ifndef PPAPI_TESTS_TESTING_INSTANCE_H_
 #define PPAPI_TESTS_TESTING_INSTANCE_H_
 
 #include <string>
 
 #include "ppapi/cpp/completion_callback.h"
-
-#if defined(__native_client__)
 #include "ppapi/cpp/instance.h"
-#else
-#include "ppapi/cpp/private/instance_private.h"
-#endif
 
 class TestCase;
 
-// In trusted builds, we use InstancePrivate and allow tests that use
-// synchronous scripting. NaCl does not support synchronous scripting.
-class TestingInstance : public
-#if defined(__native_client__)
-pp::Instance {
-#else
-pp::InstancePrivate {
-#endif
+class TestingInstance : public pp::Instance {
  public:
   explicit TestingInstance(PP_Instance instance);
   virtual ~TestingInstance();
 
   // pp::Instance override.
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
   virtual void DidChangeView(const pp::Rect& position, const pp::Rect& clip);
-
-#if !(defined __native_client__)
   virtual pp::Var GetInstanceObject();
-#endif
 
   // Outputs the information from one test run, using the format
   //   <test_name> [PASS|FAIL <error_message>]
   // If error_message is empty, we say the test passed and emit PASS. If
   // error_message is nonempty, the test failed with that message as the error
   // string.
   //
   // Intended usage:
   //   LogTest("Foo", FooTest());
   //
   // Where FooTest is defined as:
   //   std::string FooTest() {
   //     if (something_horrible_happened)
   //       return "Something horrible happened";
   //     return "";
   //   }
   void LogTest(const std::string& test_name, const std::string& error_message);
 
   // Appends an error message to the log.
   void AppendError(const std::string& message);
 
   // Passes the message_data through to the HandleMessage method on the
   // TestClass object that's associated with this instance.
   virtual void HandleMessage(const pp::Var& message_data);
 
-  const std::string& protocol() {
-    return protocol_;
-  }
-
  private:
   void ExecuteTests(int32_t unused);
 
   // Creates a new TestCase for the give test name, or NULL if there is no such
   // test. Ownership is passed to the caller.
   TestCase* CaseForTestName(const char* name);
 
   // Appends a list of available tests to the console in the document.
   void LogAvailableTests();
 
@@ skipping 12 matching lines @@
   TestCase* current_case_;
 
   // Set once the tests are run so we know not to re-run when the view is sized.
   bool executed_tests_;
 
   // Collects all errors to send the the browser. Empty indicates no error yet.
   std::string errors_;
 
   // True if running in Native Client.
   bool nacl_mode_;
-
-  // String representing the protocol.  Used for detecting whether we're running
-  // with http.
-  std::string protocol_;
 };
 
 #endif  // PPAPI_TESTS_TESTING_INSTANCE_H_