Merge to 39: PPAPI: Never re-enter JavaScript for PostMessage.

ppapi/tests/test_message_handler.cc

 // Copyright 2014 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_message_handler.h"
 
 #include <string.h>
 #include <algorithm>
 #include <map>
 #include <sstream>
@@ skipping 261 matching lines @@
     js_code += "result = plugin.postMessageAndAwaitResponse(";
     js_code +=     values_to_test[i];
     js_code += ");\n";
     js_code += "if (!deepCompare(result, ";
     js_code +=     values_to_test[i];
     js_code += "))\n";
     js_code += "  InternalError(\" Failed postMessageAndAwaitResponse for: ";
     js_code +=      values_to_test[i];
     js_code +=    " result: \" + result);\n";
   }
-  // TODO(dmichael): Setting a property uses GetInstanceObject, which sends sync
-  // message, which can get interrupted with message to eval script, etc.
-  // FINISHED_WAITING message can therefore jump ahead. This test is
-  // currently carefully crafted to avoid races by doing all the JS in one call.
-  // That should be fixed before this API goes to stable. See crbug.com/384528
-  js_code += "plugin.postMessage('FINISHED_TEST');\n";
   instance_->EvalScript(js_code);
+  instance_->EvalScript("plugin.postMessage('FINISHED_TEST');\n");
   handler.WaitForTestFinishedMessage();
   handler.Unregister();
   ASSERT_SUBTEST_SUCCESS(handler.WaitForDestroy());
 
   PASS();
 }
 
 std::string TestMessageHandler::TestExceptions() {
   EchoingMessageHandler handler(instance(),
                                 handler_thread_.message_loop());
@@ skipping 40 matching lines @@
     instance_->EvalScript(js_code);
     message_received_.Wait();
     ASSERT_EQ("SUCCESS", last_message_);
   }
   handler.Unregister();
   ASSERT_SUBTEST_SUCCESS(handler.WaitForDestroy());
 
   PASS();
 }