commit 00b8f6b3643332cce1ee711715f7fbb824d793ca
author kwiberg@webrtc.org <kwiberg@webrtc.org> Thu Feb 26 14:34:55 2015 +0000
committer kwiberg@webrtc.org <kwiberg@webrtc.org> Thu Feb 26 14:43:50 2015 +0000
tree c9b615128a443fe938a38e09023ec700d8adf62b
parent ac2d27d9ae74eb8d28ec0d5f12f70fa64461ab90

Use base/scoped_ptr.h; system_wrappers/interface/scoped_ptr.h is going away

BUG=
R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/36229004

Cr-Commit-Position: refs/heads/master@{#8517}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8517 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/system_wrappers/source/logging_unittest.cc

diff --git a/webrtc/system_wrappers/source/logging_unittest.cc b/webrtc/system_wrappers/source/logging_unittest.cc
index 6e45c5c..39bca65 100644
--- a/webrtc/system_wrappers/source/logging_unittest.cc
+++ b/webrtc/system_wrappers/source/logging_unittest.cc
@@ -11,9 +11,9 @@
 #include "webrtc/system_wrappers/interface/logging.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/condition_variable_wrapper.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/scoped_ptr.h"
 #include "webrtc/system_wrappers/interface/sleep.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
@@ -55,8 +55,8 @@
     ASSERT_EQ(kTraceNone, level_) << "Print() was not called";
   }
 
-  scoped_ptr<CriticalSectionWrapper> crit_;
-  scoped_ptr<ConditionVariableWrapper> cv_;
+  rtc::scoped_ptr<CriticalSectionWrapper> crit_;
+  rtc::scoped_ptr<ConditionVariableWrapper> cv_;
   TraceLevel level_ GUARDED_BY(crit_);
   std::ostringstream expected_log_ GUARDED_BY(crit_);
 };