Roll libjingle 132:133

third_party/libjingle/overrides/talk/base/scoped_ptr.h

Index: third_party/libjingle/overrides/talk/base/scoped_ptr.h
diff --git a/third_party/libjingle/overrides/talk/base/scoped_ptr.h b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
index 3d396d1e63ec4a764e7c7f7ae820b16081ecdfbb..b10ef5297632b9e867bbdf1cd4342f932e160e59 100644
--- a/third_party/libjingle/overrides/talk/base/scoped_ptr.h
+++ b/third_party/libjingle/overrides/talk/base/scoped_ptr.h
@@ -2,20 +2,4 @@
 // 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/memory/scoped_ptr.h.  We use
-// a version of scoped_ptr from Chromium base, to avoid multiple definitions.
-
-#ifndef OVERRIDES_TALK_BASE_SCOPED_PTR_H_
-#define OVERRIDES_TALK_BASE_SCOPED_PTR_H_
-
-#include "base/memory/scoped_ptr.h"
-#include "talk/base/common.h"
-
-namespace talk_base {
-
-using ::scoped_ptr;
-using ::scoped_array;
-
-}  // namespace talk_base
-
-#endif  // OVERRIDES_TALK_BASE_SCOPED_PTR_H_
+#include "third_party/libjingle/source/talk/base/scoped_ptr.h"