[PPAPI] Add browser tests for compositor API

base/rand_util_nacl.cc

Index: base/rand_util_nacl.cc
diff --git a/base/rand_util_nacl.cc b/base/rand_util_nacl.cc
index f9751217326b4c72730b98fa1018be49f12a4b1a..4bc8445e0d4bff43953a2625f5127cef88d756fa 100644
--- a/base/rand_util_nacl.cc
+++ b/base/rand_util_nacl.cc
@@ -4,40 +4,38 @@
 
 #include "base/rand_util.h"
 
+#include <nacl/nacl_random.h>

[Peng, 2014/06/17 19:14:46]

Please ignore changes in base folder.
It is a temporary workaround for a crash in untrusted plugin process. 
This workaround will be removed before landing.

+
 #include "base/basictypes.h"
-#include "base/lazy_instance.h"
 #include "base/logging.h"
-#include "native_client/src/untrusted/irt/irt.h"
 
 namespace {
 
-class NaclRandom {
- public:
-  NaclRandom() {
-    const size_t result =
-        nacl_interface_query(NACL_IRT_RANDOM_v0_1, &random_, sizeof(random_));
-    CHECK_EQ(result, sizeof(random_));
-  }
-
-  ~NaclRandom() {}
+int i = 0;
 
-  void GetRandomBytes(void* output, size_t num_bytes) {
+void GetRandomBytes(void* output, size_t num_bytes) {
+  if (nacl_secure_random_init() == 0) {
     char* output_ptr = static_cast<char*>(output);
     while (num_bytes > 0) {
       size_t nread;
-      const int error = random_.get_random_bytes(output_ptr, num_bytes, &nread);
+      const int error = nacl_secure_random(output_ptr, num_bytes, &nread);
       CHECK_EQ(error, 0);
       CHECK_LE(nread, num_bytes);
       output_ptr += nread;
       num_bytes -= nread;
     }
+  } else {
+    char* output_ptr = static_cast<char*>(output);
+    while (num_bytes > 0) {
+      int r = (++i) + reinterpret_cast<int>(output_ptr);
+      while (r >= 255) {
+        r = r + ( r >> 8);
+      }
+      *output_ptr++ = r;
+      num_bytes--;
+    }
   }
-
- private:
-  nacl_irt_random random_;
-};
-
-base::LazyInstance<NaclRandom>::Leaky g_nacl_random = LAZY_INSTANCE_INITIALIZER;
+}
 
 }  // namespace
 
@@ -46,12 +44,12 @@ namespace base {
 // NOTE: This function must be cryptographically secure. http://crbug.com/140076
 uint64 RandUint64() {
   uint64 result;
-  g_nacl_random.Pointer()->GetRandomBytes(&result, sizeof(result));
+  GetRandomBytes(&result, sizeof(result));
   return result;
 }
 
 void RandBytes(void* output, size_t output_length) {
-  g_nacl_random.Pointer()->GetRandomBytes(output, output_length);
+  GetRandomBytes(output, output_length);
 }
 
 }  // namespace base