Fix ExtensionServiceTest.ClearExtensionData flakiness

chrome/browser/extensions/data_deleter.cc

 // Copyright (c) 2012 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/extensions/data_deleter.h"
 
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 19 matching lines @@
 using content::StoragePartition;
 
 namespace extensions {
 
 namespace {
 
 // Helper function that deletes data of a given |storage_origin| in a given
 // |partition|.
 void DeleteOrigin(Profile* profile,
                   StoragePartition* partition,
-                  const GURL& origin) {
+                  const GURL& origin,
+                  const base::Closure& callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   DCHECK(profile);
   DCHECK(partition);
 
   if (origin.SchemeIs(kExtensionScheme)) {
     // TODO(ajwong): Cookies are not properly isolated for
     // chrome-extension:// scheme.  (http://crbug.com/158386).
     //
     // However, no isolated apps actually can write to kExtensionScheme
     // origins. Thus, it is benign to delete from the
     // RequestContextForExtensions because there's nothing stored there. We
     // preserve this code path without checking for isolation because it's
     // simpler than special casing.  This code should go away once we merge
     // the various URLRequestContexts (http://crbug.com/159193).
     partition->ClearDataForOrigin(
         ~StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE,
         StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL,
         origin,
-        profile->GetRequestContextForExtensions());
+        profile->GetRequestContextForExtensions(),
+        callback);
   } else {
     // We don't need to worry about the media request context because that
     // shares the same cookie store as the main request context.
     partition->ClearDataForOrigin(
         ~StoragePartition::REMOVE_DATA_MASK_SHADER_CACHE,
         StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL,
         origin,
-        partition->GetURLRequestContext());
+        partition->GetURLRequestContext(),
+        callback);
   }
 }
 
-void OnNeedsToGarbageCollectIsolatedStorage(WeakPtr<ExtensionService> es) {
-  if (!es)
-    return;
-  ExtensionPrefs::Get(es->profile())->SetNeedsStorageGarbageCollection(true);
+void OnNeedsToGarbageCollectIsolatedStorage(WeakPtr<ExtensionService> es,
+                                            const base::Closure& callback) {
+  if (es)
+    ExtensionPrefs::Get(es->profile())->SetNeedsStorageGarbageCollection(true);
+  callback.Run();
 }
 
 } // namespace
 
 // static
-void DataDeleter::StartDeleting(Profile* profile, const Extension* extension) {
+void DataDeleter::StartDeleting(Profile* profile,
+                                const Extension* extension,
+                                const base::Closure& callback) {
   DCHECK(profile);
   DCHECK(extension);
 
   if (AppIsolationInfo::HasIsolatedStorage(extension)) {
     BrowserContext::AsyncObliterateStoragePartition(
         profile,
         util::GetSiteForExtensionId(extension->id(), profile),
         base::Bind(
             &OnNeedsToGarbageCollectIsolatedStorage,
-            ExtensionSystem::Get(profile)->extension_service()->AsWeakPtr()));
+            ExtensionSystem::Get(profile)->extension_service()->AsWeakPtr(),
+            callback));
   } else {
     GURL launch_web_url_origin(
         AppLaunchInfo::GetLaunchWebURL(extension).GetOrigin());
 
     StoragePartition* partition = BrowserContext::GetStoragePartitionForSite(
         profile,
         Extension::GetBaseURLFromExtensionId(extension->id()));
 
     if (extension->is_hosted_app() &&
         !profile->GetExtensionSpecialStoragePolicy()->
             IsStorageProtected(launch_web_url_origin)) {
-      DeleteOrigin(profile, partition, launch_web_url_origin);
+      DeleteOrigin(profile,
+                   partition,
+                   launch_web_url_origin,
+                   base::Bind(&base::DoNothing));
     }
-    DeleteOrigin(profile, partition, extension->url());
+    DeleteOrigin(profile, partition, extension->url(), callback);
   }
 
 #if defined(ENABLE_EXTENSIONS)
   // Begin removal of the settings for the current extension.
   // StorageFrontend may not exist in unit tests.
   StorageFrontend* frontend = StorageFrontend::Get(profile);
   if (frontend)
     frontend->DeleteStorageSoon(extension->id());
 #endif  // defined(ENABLE_EXTENSIONS)
 }
 
 }  // namespace extensions