diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 19:17:16 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 19:17:16 +0000 |
commit | 901174d96b0769ad258ff42a7df7cdf6ede5c11b (patch) | |
tree | ac4c552016842a1b2aaf722737b124f48c6fa917 /components/visitedlink/browser/visitedlink_master.cc | |
parent | fee18e79ec56e01875ec2de2e4dfac17aee25906 (diff) | |
download | chromium_src-901174d96b0769ad258ff42a7df7cdf6ede5c11b.zip chromium_src-901174d96b0769ad258ff42a7df7cdf6ede5c11b.tar.gz chromium_src-901174d96b0769ad258ff42a7df7cdf6ede5c11b.tar.bz2 |
Update components/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15649019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203615 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/visitedlink/browser/visitedlink_master.cc')
-rw-r--r-- | components/visitedlink/browser/visitedlink_master.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/visitedlink/browser/visitedlink_master.cc b/components/visitedlink/browser/visitedlink_master.cc index 71bc07c..97b83ab 100644 --- a/components/visitedlink/browser/visitedlink_master.cc +++ b/components/visitedlink/browser/visitedlink_master.cc @@ -262,7 +262,7 @@ VisitedLinkMaster::Hash VisitedLinkMaster::TryToAddURL(const GURL& url) { Fingerprint fingerprint = ComputeURLFingerprint(url.spec().data(), url.spec().size(), salt_); - if (table_builder_) { + if (table_builder_.get()) { // If we have a pending delete for this fingerprint, cancel it. std::set<Fingerprint>::iterator found = deleted_since_rebuild_.find(fingerprint); @@ -293,7 +293,7 @@ void VisitedLinkMaster::PostIOTask(const tracked_objects::Location& from_here, void VisitedLinkMaster::AddURL(const GURL& url) { Hash index = TryToAddURL(url); - if (!table_builder_ && index != null_hash_) { + if (!table_builder_.get() && index != null_hash_) { // Not rebuilding, so we want to keep the file on disk up-to-date. if (persist_to_disk_) { WriteUsedItemCountToFile(); @@ -307,12 +307,12 @@ void VisitedLinkMaster::AddURLs(const std::vector<GURL>& url) { for (std::vector<GURL>::const_iterator i = url.begin(); i != url.end(); ++i) { Hash index = TryToAddURL(*i); - if (!table_builder_ && index != null_hash_) + if (!table_builder_.get() && index != null_hash_) ResizeTableIfNecessary(); } // Keeps the file on disk up-to-date. - if (!table_builder_ && persist_to_disk_) + if (!table_builder_.get() && persist_to_disk_) WriteFullTable(); } @@ -343,7 +343,7 @@ void VisitedLinkMaster::DeleteURLs(URLIterator* urls) { listener_->Reset(); - if (table_builder_) { + if (table_builder_.get()) { // A rebuild is in progress, save this deletion in the temporary list so // it can be added once rebuild is complete. while (urls->HasNextURL()) { @@ -830,7 +830,7 @@ uint32 VisitedLinkMaster::NewTableSizeForCount(int32 item_count) const { // See the TableBuilder definition in the header file for how this works. bool VisitedLinkMaster::RebuildTableFromDelegate() { - DCHECK(!table_builder_); + DCHECK(!table_builder_.get()); // TODO(brettw) make sure we have reasonable salt! table_builder_ = new TableBuilder(this, salt_); |