diff options
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/browsing_data_remover.h | 4 | ||||
| -rw-r--r-- | chrome/test/data/reliability/known_crashes.txt | 3 | ||||
| -rw-r--r-- | content/public/browser/browser_thread.h | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index fd51fcd..ec0b624 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -3659,7 +3659,7 @@ void TestingAutomationProvider::ClearBrowsingData( remover->AddObserver( new AutomationProviderBrowsingDataObserver(this, reply_message)); remover->Remove(remove_mask, BrowsingDataHelper::UNPROTECTED_WEB); - // BrowsingDataRemover deletes itself using DeleteTask. + // BrowsingDataRemover deletes itself using DeleteHelper. // The observer also deletes itself after sending the reply. } diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h index af71067..a53e586 100644 --- a/chrome/browser/browsing_data_remover.h +++ b/chrome/browser/browsing_data_remover.h @@ -168,8 +168,8 @@ class BrowsingDataRemover : public content::NotificationObserver, STATE_DONE }; - // BrowsingDataRemover deletes itself (using DeleteTask) and is not supposed - // to be deleted by other objects so make destructor private and DeleteTask + // BrowsingDataRemover deletes itself (using DeleteHelper) and is not supposed + // to be deleted by other objects so make destructor private and DeleteHelper // a friend. friend class base::DeleteHelper<BrowsingDataRemover>; virtual ~BrowsingDataRemover(); diff --git a/chrome/test/data/reliability/known_crashes.txt b/chrome/test/data/reliability/known_crashes.txt index f7ca518..55dba8b 100644 --- a/chrome/test/data/reliability/known_crashes.txt +++ b/chrome/test/data/reliability/known_crashes.txt @@ -156,9 +156,6 @@ PREFIX: webcore::renderobject::destroy___webcore::renderobjectchildlist::destroy # 77176 PREFIX: webcore::implicitanimation::~implicitanimation___webcore::implicitanimation::`scalar deleting destructor'___wtf::hashtable<wtf::refptr<webcore::animationbase>,wtf::refptr<webcore::animationbase>,wtf::identityextractor<wtf::refptr<webcore::animationbase> >,wtf::ptrhash<wtf::refptr<webcore::animationbase> >,wtf::hashtraits<wtf::refptr<webcore::animationbase> >,wtf::hashtraits<wtf::refptr<webcore::animationbase> > >::deallocatetable -# 21054 -REGEX : ^deletetask.*::run___messageloop::runtask___messageloop::dowork - # 84178 PREFIX: `anonymous namespace'::establishchannelcallback::send___`anonymous namespace'::establishchannelcallback::runwithparams___gpuprocesshost::sendoutstandingreplies diff --git a/content/public/browser/browser_thread.h b/content/public/browser/browser_thread.h index 0ac582b..01d5ce0 100644 --- a/content/public/browser/browser_thread.h +++ b/content/public/browser/browser_thread.h @@ -271,7 +271,7 @@ class CONTENT_EXPORT BrowserThread { // ... // private: // friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>; - // friend class DeleteTask<Foo>; + // friend class base::DeleteHelper<Foo>; // // ~Foo(); struct DeleteOnUIThread : public DeleteOnThread<UI> { }; |