Not posting appcache cleaning task if there is no appcache service.

chrome/browser/browsing_data_remover.cc

 // 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.
 
 #include "chrome/browser/browsing_data_remover.h"
 
 #include <map>
 #include <set>
 
 #include "base/callback.h"
@@ skipping 48 matching lines @@
                                          base::Time delete_begin,
                                          base::Time delete_end)
     : profile_(profile),
       special_storage_policy_(profile->GetExtensionSpecialStoragePolicy()),
       delete_begin_(delete_begin),
       delete_end_(delete_end),
       ALLOW_THIS_IN_INITIALIZER_LIST(database_cleared_callback_(
           this, &BrowsingDataRemover::OnClearedDatabases)),
       ALLOW_THIS_IN_INITIALIZER_LIST(cache_callback_(
           this, &BrowsingDataRemover::DoClearCache)),
-      appcache_service_(profile->GetAppCacheService()),
       ALLOW_THIS_IN_INITIALIZER_LIST(appcache_got_info_callback_(
           this, &BrowsingDataRemover::OnGotAppCacheInfo)),
       ALLOW_THIS_IN_INITIALIZER_LIST(appcache_deleted_callback_(
           this, &BrowsingDataRemover::OnAppCacheDeleted)),
       appcaches_to_be_deleted_count_(0),
       next_cache_state_(STATE_NONE),
       cache_(NULL),
       main_context_getter_(profile->GetRequestContext()),
       media_context_getter_(profile->GetRequestContextForMedia()),
       waiting_for_clear_databases_(false),
@@ skipping 138 matching lines @@
     database_tracker_ = profile_->GetDatabaseTracker();
     if (database_tracker_.get()) {
       waiting_for_clear_databases_ = true;
       BrowserThread::PostTask(
           BrowserThread::FILE, FROM_HERE,
           NewRunnableMethod(
               this,
               &BrowsingDataRemover::ClearDatabasesOnFILEThread));
     }
 
-    waiting_for_clear_appcache_ = true;
-    BrowserThread::PostTask(
-        BrowserThread::IO, FROM_HERE,
-        NewRunnableMethod(
-            this,
-            &BrowsingDataRemover::ClearAppCacheOnIOThread));
+    appcache_service_ = profile_->GetAppCacheService();

[jochen (gone - plz use gerrit), 2011/07/06 09:44:16]

why did you move this out of the initilization list?

[marja(google), 2011/07/06 10:29:38]

Like the database_tracker_ above. Remove() will be called only once for each
BrowsingDataRemover (since BrowsingDataRemover is self-destructing), so it's
less work to retrieve the appcache service only if it's needed. Probably this is
not very relevant, I just thought to follow the pattern for database_tracker_.

[jochen (gone - plz use gerrit), 2011/07/06 10:39:45]

ok

+    if (appcache_service_.get()) {
+      waiting_for_clear_appcache_ = true;
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          NewRunnableMethod(
+              this,
+              &BrowsingDataRemover::ClearAppCacheOnIOThread));
+    }
 
     waiting_for_clear_gears_data_ = true;
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         NewRunnableMethod(
             this,
             &BrowsingDataRemover::ClearGearsDataOnFILEThread,
             profile_->GetPath()));
 
     waiting_for_clear_file_systems_ = true;
@@ skipping 276 matching lines @@
     return;
   }
   waiting_for_clear_appcache_ = false;
   NotifyAndDeleteIfDone();
 }
 
 void BrowsingDataRemover::ClearAppCacheOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(waiting_for_clear_appcache_);
   appcache_info_ = new appcache::AppCacheInfoCollection;
-  if (appcache_service_) {
-    appcache_service_->GetAllAppCacheInfo(
-        appcache_info_, &appcache_got_info_callback_);
-    // continues in OnGotAppCacheInfo
-  } else {
-    // Couldn't get app cache service, nothing to clear.
-    OnClearedAppCache();
-  }
+  appcache_service_->GetAllAppCacheInfo(
+    appcache_info_, &appcache_got_info_callback_);

[jochen (gone - plz use gerrit), 2011/07/06 09:44:16]

four spaces indenting

[marja(google), 2011/07/06 10:29:38]

Fixed.

+  // continues in OnGotAppCacheInfo

[jochen (gone - plz use gerrit), 2011/07/06 09:44:16]

. at end of comment

[marja(google), 2011/07/06 10:29:38]

Fixed.

 }
 
 void BrowsingDataRemover::OnGotAppCacheInfo(int rv) {
   using appcache::AppCacheInfoVector;
   typedef std::map<GURL, AppCacheInfoVector> InfoByOrigin;
 
   for (InfoByOrigin::const_iterator origin =
            appcache_info_->infos_by_origin.begin();
        origin != appcache_info_->infos_by_origin.end(); ++origin) {
     if (special_storage_policy_->IsStorageProtected(origin->first))
@@ skipping 80 matching lines @@
 
   ClearGearsData(profile_dir);
   OnClearedGearsData();
 }
 
 void BrowsingDataRemover::OnWaitableEventSignaled(
     base::WaitableEvent* waitable_event) {
   waiting_for_clear_lso_data_ = false;
   NotifyAndDeleteIfDone();
 }