Revert 91859 - Porting ppapi_tests framework to postMessage.

ppapi/tests/testing_instance.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/testing_instance.h"
 
 #include <algorithm>
 #include <cstring>
 #include <vector>
 
 #include "ppapi/cpp/module.h"
 #include "ppapi/cpp/var.h"
 #include "ppapi/tests/test_case.h"
 
 TestCaseFactory* TestCaseFactory::head_ = NULL;
 
 // Returns a new heap-allocated test case for the given test, or NULL on
 // failure.
 TestingInstance::TestingInstance(PP_Instance instance)
-#if (defined __native_client__)
     : pp::Instance(instance),
-#else
-    : pp::InstancePrivate(instance),
-#endif
       current_case_(NULL),
       executed_tests_(false),
       nacl_mode_(false) {
   callback_factory_.Initialize(this);
 }
 
 TestingInstance::~TestingInstance() {
   if (current_case_)
     delete current_case_;
 }
 
 bool TestingInstance::Init(uint32_t argc,
                            const char* argn[],
                            const char* argv[]) {
   for (uint32_t i = 0; i < argc; i++) {
     if (std::strcmp(argn[i], "mode") == 0) {
       if (std::strcmp(argv[i], "nacl") == 0)
         nacl_mode_ = true;
+      break;
     }
-    else if (std::strcmp(argn[i], "protocol") == 0)
-      protocol_ = argv[i];
   }
   // Create the proper test case from the argument.
   for (uint32_t i = 0; i < argc; i++) {
     if (std::strcmp(argn[i], "testcase") == 0) {
       if (argv[i][0] == '\0')
         break;
       current_case_ = CaseForTestName(argv[i]);
       if (!current_case_)
         errors_.append(std::string("Unknown test case ") + argv[i]);
       else if (!current_case_->Init())
         errors_.append(" Test case could not initialize.");
       return true;
     }
   }
 
   // In DidChangeView, we'll dump out a list of all available tests.
   return true;
 }
 
-#if !(defined __native_client__)
 pp::Var TestingInstance::GetInstanceObject() {
   if (current_case_)
     return current_case_->GetTestObject();
 
-  return pp::VarPrivate();
+  return pp::Var(this, NULL);
 }
-#endif
 
 void TestingInstance::HandleMessage(const pp::Var& message_data) {
   current_case_->HandleMessage(message_data);
 }
 
 void TestingInstance::DidChangeView(const pp::Rect& position,
                                     const pp::Rect& clip) {
   if (!executed_tests_) {
     executed_tests_ = true;
     pp::Module::Get()->core()->CallOnMainThread(
@@ skipping 26 matching lines @@
 void TestingInstance::AppendError(const std::string& message) {
   if (!errors_.empty())
     errors_.append(", ");
   errors_.append(message);
 }
 
 void TestingInstance::ExecuteTests(int32_t unused) {
   SetCookie("STARTUP_COOKIE", "STARTED");
 
   // Clear the console.
-  PostMessage(pp::Var("TESTING_MESSAGE:ClearConsole"));
+  // This does: window.document.getElementById("console").innerHTML = "";
+  pp::Var window = GetWindowObject();
+  window.GetProperty("document").
+      Call("getElementById", "console").SetProperty("innerHTML", "");
 
   if (!errors_.empty()) {
     // Catch initialization errors and output the current error string to
     // the console.
     LogError("Plugin initialization failed: " + errors_);
   } else if (!current_case_) {
     LogAvailableTests();
     errors_.append("FAIL: Only listed tests");
   } else {
     current_case_->RunTest();
     // Automated PyAuto tests rely on finding the exact strings below.
     LogHTML(errors_.empty() ?
             "<span class=\"pass\">[SHUTDOWN]</span> All tests passed." :
             "<span class=\"fail\">[SHUTDOWN]</span> Some tests failed.");
   }
 
   // Declare we're done by setting a cookie to either "PASS" or the errors.
   SetCookie("COMPLETION_COOKIE", errors_.empty() ? "PASS" : errors_);
-  PostMessage(pp::Var("TESTING_MESSAGE:DidExecuteTests"));
+
+  window.Call("DidExecuteTests");
 }
 
 TestCase* TestingInstance::CaseForTestName(const char* name) {
   TestCaseFactory* iter = TestCaseFactory::head_;
   while (iter != NULL) {
     if (std::strcmp(name, iter->name_) == 0)
       return iter->method_(this);
     iter = iter->next_;
   }
   return NULL;
@@ skipping 15 matching lines @@
     html.append("<dd><a href='?testcase=");
     html.append(test_cases[i]);
     if (nacl_mode_)
        html.append("&mode=nacl");
     html.append("'>");
     html.append(test_cases[i]);
     html.append("</a></dd>");
   }
   html.append("</dl>");
   html.append("<button onclick='RunAll()'>Run All Tests</button>");
-
   LogHTML(html);
 }
 
 void TestingInstance::LogError(const std::string& text) {
   std::string html;
   html.append("<span class=\"fail\">FAIL</span>: <span class=\"err_msg\">");
   html.append(text);
   html.append("</span>");
   LogHTML(html);
 }
 
 void TestingInstance::LogHTML(const std::string& html) {
-  std::string message("TESTING_MESSAGE:LogHTML:");
-  message.append(html);
-  PostMessage(pp::Var(message));
+  // This does: window.document.getElementById("console").innerHTML += html
+  pp::Var console = GetWindowObject().GetProperty("document").
+      Call("getElementById", "console");
+  pp::Var inner_html = console.GetProperty("innerHTML");
+  console.SetProperty("innerHTML", inner_html.AsString() + html);
 }
 
 void TestingInstance::SetCookie(const std::string& name,
                                 const std::string& value) {
-  std::string message("TESTING_MESSAGE:SetCookie:");
-  message.append(name);
-  message.append("=");
-  message.append(value);
-  PostMessage(pp::Var(message));
+  // window.document.cookie = "<name>=<value>; path=/"
+  std::string cookie_string = name + "=" + value + "; path=/";
+  pp::Var document = GetWindowObject().GetProperty("document");
+  document.SetProperty("cookie", cookie_string);
 }
 
 class Module : public pp::Module {
  public:
   Module() : pp::Module() {}
   virtual ~Module() {}
 
   virtual pp::Instance* CreateInstance(PP_Instance instance) {
     return new TestingInstance(instance);
   }
 };
 
 namespace pp {
 
 Module* CreateModule() {
   return new ::Module();
 }
 
 }  // namespace pp