Eliminate 'if defiend(CHECK) to avoid having to different binaries for the same template function.
There is a new crash report but not caught by the CHECKS.
(http://crash/reportdetail?reportid=accf4c24431527ce#crashing_thread)
This could be because this ifdef generates two different objects of this template function and linker may be picking bad one.
BUG=chromium-os:7327
TEST=none
Review URL: http://codereview.chromium.org/5405003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67913 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: a9f206fe4f79573c7c8f90242738a6dc909afc0c
diff --git a/base/tuple.h b/base/tuple.h
index bfe6562..6b0d336 100644
--- a/base/tuple.h
+++ b/base/tuple.h
@@ -30,6 +30,10 @@
#define BASE_TUPLE_H__
#pragma once
+#if defined(OS_CHROMEOS)
+// To troubleshoot crosbug.com/7327.
+#include "base/logging.h"
+#endif
// Traits ----------------------------------------------------------------------
//
// A simple traits class for tuple arguments.
@@ -545,7 +549,7 @@
template <class ObjT, class Method, class A>
inline void DispatchToMethod(ObjT* obj, Method method, const Tuple1<A>& arg) {
-#if defined(OS_CHROMEOS) && defined(CHECK)
+#if defined(OS_CHROMEOS)
// To troubleshoot crosbug.com/7327.
CHECK(obj);
CHECK(&arg);