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

Unified Diff: third_party/libvpx/source/libvpx/third_party/googletest/src/src/gtest_main.cc

Issue 1158913006: Move libvpx from DEPS to src (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add DEPS file with #include paths 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: third_party/libvpx/source/libvpx/third_party/googletest/src/src/gtest_main.cc
diff --git a/third_party/tcmalloc/chromium/src/google/heap-checker.h b/third_party/libvpx/source/libvpx/third_party/googletest/src/src/gtest_main.cc
similarity index 86%
copy from third_party/tcmalloc/chromium/src/google/heap-checker.h
copy to third_party/libvpx/source/libvpx/third_party/googletest/src/src/gtest_main.cc
index 8aa5ea49ca95a2ee8e468bd118ecbf5910c9903c..f3028225523306eb9648f94bcbe9e3a78016bb7e 100644
--- a/third_party/tcmalloc/chromium/src/google/heap-checker.h
+++ b/third_party/libvpx/source/libvpx/third_party/googletest/src/src/gtest_main.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2005, Google Inc.
+// Copyright 2006, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,12 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-/* The code has moved to gperftools/. Use that include-directory for
- * new code.
- */
-#include <gperftools/heap-checker.h>
+#include <stdio.h>
+
+#include "gtest/gtest.h"
+
+GTEST_API_ int main(int argc, char **argv) {
+ printf("Running main() from gtest_main.cc\n");
+ testing::InitGoogleTest(&argc, argv);
+ return RUN_ALL_TESTS();
+}

Powered by Google App Engine
This is Rietveld 408576698