Revert of Remove webrtc/base/scoped_ptr.h

webrtc/modules/utility/include/jvm_android.h

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
 #define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
 
 #include <jni.h>
 
 #include <memory>
 #include <string>
 
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/thread_checker.h"
 #include "webrtc/modules/utility/include/helpers_android.h"
 
 namespace webrtc {
 
 // The JNI interface pointer (JNIEnv) is valid only in the current thread.
 // Should another thread need to access the Java VM, it must first call
 // AttachCurrentThread() to attach itself to the VM and obtain a JNI interface
 // pointer. The native thread remains attached to the VM until it calls
 // DetachCurrentThread() to detach.
@@ skipping 148 matching lines @@
   JNIEnv* jni() const { return GetEnv(jvm_); }
 
   rtc::ThreadChecker thread_checker_;
   JavaVM* const jvm_;
   jobject context_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_