diff options
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/net/passive_log_collector.cc | 20 | ||||
| -rw-r--r-- | chrome/browser/net/passive_log_collector.h | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc index 3cc1353..677e1d7 100644 --- a/chrome/browser/net/passive_log_collector.cc +++ b/chrome/browser/net/passive_log_collector.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -92,7 +92,7 @@ void PassiveLogCollector::OnAddEntry( ChromeNetLog::Entry entry(num_events_seen_++, type, time, source, phase, params); - SourceTrackerInterface* tracker = GetTrackerForSourceType_(entry.source.type); + SourceTrackerInterface* tracker = GetTrackerForSourceType(entry.source.type); if (tracker) tracker->OnAddEntry(entry); } @@ -104,10 +104,10 @@ void PassiveLogCollector::Clear() { } PassiveLogCollector::SourceTrackerInterface* -PassiveLogCollector::GetTrackerForSourceType_( +PassiveLogCollector::GetTrackerForSourceType( net::NetLog::SourceType source_type) { - DCHECK_LE(source_type, static_cast<int>(arraysize(trackers_))); - DCHECK_GE(source_type, 0); + CHECK_LT(source_type, static_cast<int>(arraysize(trackers_))); + CHECK_GE(source_type, 0); return trackers_[source_type]; } @@ -234,8 +234,8 @@ void PassiveLogCollector::SourceTracker::DeleteSourceInfo( return; } // The source should not be in the deletion queue. - DCHECK(std::find(deletion_queue_.begin(), deletion_queue_.end(), - source_id) == deletion_queue_.end()); + CHECK(std::find(deletion_queue_.begin(), deletion_queue_.end(), + source_id) == deletion_queue_.end()); ReleaseAllReferencesToDependencies(&(it->second)); sources_.erase(it); } @@ -288,7 +288,7 @@ void PassiveLogCollector::SourceTracker::EraseFromDeletionQueue( DeletionQueue::iterator it = std::remove(deletion_queue_.begin(), deletion_queue_.end(), source_id); - DCHECK(it != deletion_queue_.end()); + CHECK(it != deletion_queue_.end()); deletion_queue_.erase(it); } @@ -338,7 +338,7 @@ void PassiveLogCollector::SourceTracker::AddReferenceToSourceDependency( DCHECK(parent_); DCHECK_NE(source.type, net::NetLog::SOURCE_NONE); SourceTracker* tracker = static_cast<SourceTracker*>( - parent_->GetTrackerForSourceType_(source.type)); + parent_->GetTrackerForSourceType(source.type)); DCHECK(tracker); // Tell the owning tracker to increment the reference count of |source|. @@ -359,7 +359,7 @@ void PassiveLogCollector::SourceTracker::ReleaseAllReferencesToDependencies( DCHECK(parent_); DCHECK_NE(source.type, net::NetLog::SOURCE_NONE); SourceTracker* tracker = static_cast<SourceTracker*>( - parent_->GetTrackerForSourceType_(source.type)); + parent_->GetTrackerForSourceType(source.type)); DCHECK(tracker); // Tell the owning tracker to decrement the reference count of |source|. diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h index d407b86..0b1c0f9 100644 --- a/chrome/browser/net/passive_log_collector.h +++ b/chrome/browser/net/passive_log_collector.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -361,7 +361,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserver { private: // Returns the tracker to use for sources of type |source_type|, or NULL. - SourceTrackerInterface* GetTrackerForSourceType_( + SourceTrackerInterface* GetTrackerForSourceType( net::NetLog::SourceType source_type); FRIEND_TEST_ALL_PREFIXES(PassiveLogCollectorTest, |