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

132
webrtc/base/referencecountedsingletonfactory_unittest.cc
View File

@ -1,132 +0,0 @@
/*
* Copyright 2004 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/gunit.h"
#include "webrtc/base/referencecountedsingletonfactory.h"
namespace rtc {
class MyExistenceWatcher {
public:
MyExistenceWatcher() { create_called_ = true; }
~MyExistenceWatcher() { delete_called_ = true; }
static bool create_called_;
static bool delete_called_;
};
bool MyExistenceWatcher::create_called_ = false;
bool MyExistenceWatcher::delete_called_ = false;
class TestReferenceCountedSingletonFactory :
public ReferenceCountedSingletonFactory<MyExistenceWatcher> {
protected:
virtual bool SetupInstance() {
instance_.reset(new MyExistenceWatcher());
return true;
}
virtual void CleanupInstance() {
instance_.reset();
}
};
static void DoCreateAndGoOutOfScope(
ReferenceCountedSingletonFactory<MyExistenceWatcher> *factory) {
rcsf_ptr<MyExistenceWatcher> ptr(factory);
ptr.get();
// and now ptr should go out of scope.
}
TEST(ReferenceCountedSingletonFactory, ZeroReferenceCountCausesDeletion) {
TestReferenceCountedSingletonFactory factory;
MyExistenceWatcher::delete_called_ = false;
DoCreateAndGoOutOfScope(&factory);
EXPECT_TRUE(MyExistenceWatcher::delete_called_);
}
TEST(ReferenceCountedSingletonFactory, NonZeroReferenceCountDoesNotDelete) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> ptr(&factory);
ptr.get();
MyExistenceWatcher::delete_called_ = false;
DoCreateAndGoOutOfScope(&factory);
EXPECT_FALSE(MyExistenceWatcher::delete_called_);
}
TEST(ReferenceCountedSingletonFactory, ReturnedPointersReferToSameThing) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> one(&factory), two(&factory);
EXPECT_EQ(one.get(), two.get());
}
TEST(ReferenceCountedSingletonFactory, Release) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> one(&factory);
one.get();
MyExistenceWatcher::delete_called_ = false;
one.release();
EXPECT_TRUE(MyExistenceWatcher::delete_called_);
}
TEST(ReferenceCountedSingletonFactory, GetWithoutRelease) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> one(&factory);
one.get();
MyExistenceWatcher::create_called_ = false;
one.get();
EXPECT_FALSE(MyExistenceWatcher::create_called_);
}
TEST(ReferenceCountedSingletonFactory, GetAfterRelease) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> one(&factory);
MyExistenceWatcher::create_called_ = false;
one.release();
one.get();
EXPECT_TRUE(MyExistenceWatcher::create_called_);
}
TEST(ReferenceCountedSingletonFactory, MultipleReleases) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> one(&factory), two(&factory);
MyExistenceWatcher::create_called_ = false;
MyExistenceWatcher::delete_called_ = false;
one.release();
EXPECT_FALSE(MyExistenceWatcher::delete_called_);
one.release();
EXPECT_FALSE(MyExistenceWatcher::delete_called_);
one.release();
EXPECT_FALSE(MyExistenceWatcher::delete_called_);
one.get();
EXPECT_TRUE(MyExistenceWatcher::create_called_);
}
TEST(ReferenceCountedSingletonFactory, Existentialism) {
TestReferenceCountedSingletonFactory factory;
rcsf_ptr<MyExistenceWatcher> one(&factory);
MyExistenceWatcher::create_called_ = false;
MyExistenceWatcher::delete_called_ = false;
one.get();
EXPECT_TRUE(MyExistenceWatcher::create_called_);
one.release();
EXPECT_TRUE(MyExistenceWatcher::delete_called_);
}
} // namespace rtc