Index: third_party/libjingle/overrides/talk/base/constructormagic.h |
diff --git a/third_party/libjingle/overrides/talk/base/constructormagic.h b/third_party/libjingle/overrides/talk/base/constructormagic.h |
deleted file mode 100644 |
index 7f1294de5de9dc511f443b9be6d5a59887bae5ab..0000000000000000000000000000000000000000 |
--- a/third_party/libjingle/overrides/talk/base/constructormagic.h |
+++ /dev/null |
@@ -1,14 +0,0 @@ |
-// Copyright 2014 The Chromium Authors. All rights reserved. |
-// Use of this source code is governed by a BSD-style license that can be |
-// found in the LICENSE file. |
- |
-// This file overrides the inclusion of talk/base/constructormagic.h |
-// We do this because constructor magic defines DISALLOW_EVIL_CONSTRUCTORS, |
-// but we want to use the version from Chromium. |
- |
-#ifndef OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__ |
-#define OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__ |
- |
-#include "base/basictypes.h" |
- |
-#endif // OVERRIDES_TALK_BASE_CONSTRUCTORMAGIC_H__ |