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

Unified Diff: third_party/breakpad/linux/breakpad_googletest_includes.h

Issue 1604923003: Import the contents of //third_party/breakpad/linux from Chromium. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « no previous file | third_party/breakpad/linux/generate-test-dump.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/breakpad/linux/breakpad_googletest_includes.h
diff --git a/third_party/tcmalloc/vendor/src/google/heap-checker.h b/third_party/breakpad/linux/breakpad_googletest_includes.h
similarity index 85%
copy from third_party/tcmalloc/vendor/src/google/heap-checker.h
copy to third_party/breakpad/linux/breakpad_googletest_includes.h
index 8aa5ea49ca95a2ee8e468bd118ecbf5910c9903c..aeab31563d41063c69d26fcf9da83b1397e0d67d 100644
--- a/third_party/tcmalloc/vendor/src/google/heap-checker.h
+++ b/third_party/breakpad/linux/breakpad_googletest_includes.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2005, Google Inc.
+// Copyright (c) 2009, Google Inc.
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,10 @@
// (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>
+#ifndef BREAKPAD_GOOGLETEST_INCLUDES_H__
+#define BREAKPAD_GOOGLETEST_INCLUDES_H__
+
+#include "testing/gtest/include/gtest/gtest.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+#endif // BREAKPAD_GOOGLETEST_INCLUDES_H__
« no previous file with comments | « no previous file | third_party/breakpad/linux/generate-test-dump.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698