Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(545)

Unified Diff: base/test/malloc_wrapper.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: base/test/malloc_wrapper.cc
diff --git a/build/android/pylib/remote/device/dummy/src/org/chromium/dummy/Dummy.java b/base/test/malloc_wrapper.cc
similarity index 60%
copy from build/android/pylib/remote/device/dummy/src/org/chromium/dummy/Dummy.java
copy to base/test/malloc_wrapper.cc
index 1281b39586e399c3103b5f2ab3ca1f3fab26d182..eb280a3eeea52f49e534c7c5e3f6f7a40e80a750 100644
--- a/build/android/pylib/remote/device/dummy/src/org/chromium/dummy/Dummy.java
+++ b/base/test/malloc_wrapper.cc
@@ -2,8 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-package org.chromium.dummy;
+#include "malloc_wrapper.h"
-/** Does nothing. */
-class Dummy {}
+#include <stdlib.h>
+void* MallocWrapper(size_t size) {
+ return malloc(size);
+}

Powered by Google App Engine
This is Rietveld 408576698