zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert 6107 "Adds a modified copy of talk/base to webrtc/base. I..."

Browse Source 
This breaks Chromium FYI builds and prevent roll of webrtc/libjingle to Chrome.

http://chromegw.corp.google.com/i/chromium.webrtc.fyi/builders/Win%20Builder/builds/457


> Adds a modified copy of talk/base to webrtc/base. It is the first step in migrating talk/base to webrtc/base.
> 
> BUG=N/A
> R=andrew@webrtc.org, wu@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/12199004

TBR=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6116 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
perkj@webrtc.org
2014-05-13 08:15:48 +00:00
parent 3a5825909d
commit e9a604accd
386 changed files with 6 additions and 84973 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
webrtc/base/scopedptrcollection_unittest.cc
View File

@ -1,73 +0,0 @@
/*
* Copyright 2014 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.
*/
#include "webrtc/base/scopedptrcollection.h"
#include "webrtc/base/gunit.h"
namespace rtc {
namespace {
class InstanceCounter {
public:
explicit InstanceCounter(int* num_instances)
: num_instances_(num_instances) {
++(*num_instances_);
}
~InstanceCounter() {
--(*num_instances_);
}
private:
int* num_instances_;
DISALLOW_COPY_AND_ASSIGN(InstanceCounter);
};
} // namespace
class ScopedPtrCollectionTest : public testing::Test {
protected:
ScopedPtrCollectionTest()
: num_instances_(0),
collection_(new ScopedPtrCollection<InstanceCounter>()) {
}
int num_instances_;
scoped_ptr<ScopedPtrCollection<InstanceCounter> > collection_;
};
TEST_F(ScopedPtrCollectionTest, PushBack) {
EXPECT_EQ(0u, collection_->collection().size());
EXPECT_EQ(0, num_instances_);
const int kNum = 100;
for (int i = 0; i < kNum; ++i) {
collection_->PushBack(new InstanceCounter(&num_instances_));
}
EXPECT_EQ(static_cast<size_t>(kNum), collection_->collection().size());
EXPECT_EQ(kNum, num_instances_);
collection_.reset();
EXPECT_EQ(0, num_instances_);
}
TEST_F(ScopedPtrCollectionTest, Remove) {
InstanceCounter* ic = new InstanceCounter(&num_instances_);
collection_->PushBack(ic);
EXPECT_EQ(1u, collection_->collection().size());
collection_->Remove(ic);
EXPECT_EQ(1, num_instances_);
collection_.reset();
EXPECT_EQ(1, num_instances_);
delete ic;
EXPECT_EQ(0, num_instances_);
}
} // namespace rtc