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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/base/gunit_prod.h

Issue 2877023002: Move webrtc/{base => rtc_base} (Closed)
Patch Set: Fix invalid merge Created 3 years, 6 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
« webrtc/base/compile_assert_c.h ('K') | « webrtc/base/gunit.h ('k') | webrtc/base/helpers.h » ('j') | webrtc/base/sigslotrepeater.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/gunit_prod.h
diff --git a/webrtc/base/gunit_prod.h b/webrtc/base/gunit_prod.h
index dc39bbd0eb8a17c62d0d477276300c7ad1ab9336..44b3ddbe5c8579b7dfde2eac8f96853f10dbc182 100644
--- a/webrtc/base/gunit_prod.h
+++ b/webrtc/base/gunit_prod.h
@@ -11,14 +11,9 @@
#ifndef WEBRTC_BASE_GUNIT_PROD_H_
#define WEBRTC_BASE_GUNIT_PROD_H_
-#if defined(WEBRTC_ANDROID)
-// Android doesn't use gtest at all, so anything that relies on gtest should
-// check this define first.
-#define NO_GTEST
-#elif defined (GTEST_RELATIVE_PATH)
-#include "gtest/gtest_prod.h"
-#else
-#include "testing/base/gunit_prod.h"
-#endif
+
kwiberg-webrtc 2017/06/27 09:49:40 Extra blank line.
kjellander_webrtc 2017/06/27 13:29:16 Done.
+// This header is deprecated and is just left here temporarily during
+// refactoring. See https://bugs.webrtc.org/7634 for more details.
+#include "webrtc/rtc_base/gunit_prod.h"
#endif // WEBRTC_BASE_GUNIT_PROD_H_
« webrtc/base/compile_assert_c.h ('K') | « webrtc/base/gunit.h ('k') | webrtc/base/helpers.h » ('j') | webrtc/base/sigslotrepeater.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698