Stop using some scoped_ptr features that unique_ptr doesn't have

webrtc/base/optional_unittest.cc

 /*
  *  Copyright 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.
  */
 
@@ skipping 47 matching lines @@
     Log2("operator==", a, b);
     return a.origin_ == b.origin_;
   }
   friend bool operator!=(const Logger& a, const Logger& b) {
     Log2("operator!=", a, b);
     return a.origin_ != b.origin_;
   }
   void Foo() { Log("Foo()"); }
   void Foo() const { Log("Foo() const"); }
   static rtc::scoped_ptr<std::vector<std::string>> Setup() {
-    auto s = rtc_make_scoped_ptr(new std::vector<std::string>);
+    rtc::scoped_ptr<std::vector<std::string>> s(new std::vector<std::string>);
     g_log = s.get();
     g_next_id = 0;
     return s;
   }
 
  private:
   int id_;
   int origin_;
   static std::vector<std::string>* g_log;
   static int g_next_id;
@@ skipping 401 matching lines @@
               "4:17. copy constructor (from 0:17)", "5:5. default constructor",
               "6:6. default constructor", "7:7. default constructor", "---",
               "swap 2:42, 3:17", "swap 4:5, 5:17", "swap 6:7, 7:6", "---",
               "7:6. destructor", "6:7. destructor", "5:17. destructor",
               "4:5. destructor", "3:17. destructor", "2:42. destructor",
               "1:42. destructor", "0:17. destructor"),
             *log);
 }
 
 }  // namespace rtc