| Index: webkit/quota/mock_storage_client.cc
|
| diff --git a/webkit/quota/mock_storage_client.cc b/webkit/quota/mock_storage_client.cc
|
| index 6a07989475fe10fb6fd51e75af4a06db1c7ac378..1e786e50fabf86281629a2352500264ae577c04b 100644
|
| --- a/webkit/quota/mock_storage_client.cc
|
| +++ b/webkit/quota/mock_storage_client.cc
|
| @@ -18,41 +18,8 @@ using base::AtomicSequenceNumber;
|
|
|
| namespace quota {
|
|
|
| -namespace {
|
| -
|
| using std::make_pair;
|
|
|
| -class MockStorageClientIDSequencer {
|
| - public:
|
| - static MockStorageClientIDSequencer* GetInstance() {
|
| - return Singleton<MockStorageClientIDSequencer>::get();
|
| - }
|
| -
|
| - QuotaClient::ID NextMockID() {
|
| - return static_cast<QuotaClient::ID>(
|
| - QuotaClient::kMockStart + seq_.GetNext());
|
| - }
|
| -
|
| - private:
|
| - MockStorageClientIDSequencer() { }
|
| - friend struct DefaultSingletonTraits<MockStorageClientIDSequencer>;
|
| - AtomicSequenceNumber seq_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(MockStorageClientIDSequencer);
|
| -};
|
| -
|
| -} // anonymous namespace
|
| -
|
| -MockStorageClient::MockStorageClient(
|
| - QuotaManagerProxy* quota_manager_proxy,
|
| - const MockOriginData* mock_data, size_t mock_data_size)
|
| - : quota_manager_proxy_(quota_manager_proxy),
|
| - id_(MockStorageClientIDSequencer::GetInstance()->NextMockID()),
|
| - mock_time_counter_(0),
|
| - ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {
|
| - Populate(mock_data, mock_data_size);
|
| -}
|
| -
|
| MockStorageClient::MockStorageClient(
|
| QuotaManagerProxy* quota_manager_proxy,
|
| const MockOriginData* mock_data, QuotaClient::ID id, size_t mock_data_size)
|
|
|