Fix ExtensionServiceTest.ClearExtensionData flakiness

chrome/browser/background/background_application_list_model_unittest.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.
 
 // TODO(rickcam): Bug 73183: Add unit tests for image loading
 
 #include <cstdlib>
 #include <set>
 
 #include "chrome/browser/background/background_application_list_model.h"
@@ skipping 209 matching lines @@
   service->AddExtension(bgapp2.get());
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
   ASSERT_FALSE(IsBackgroundApp(*ext3.get()));
   service->AddExtension(ext3.get());
   ASSERT_EQ(5U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
 
   // Remove in FIFO order.
   ASSERT_FALSE(IsBackgroundApp(*ext1.get()));
-  service->UninstallExtension(
-      ext1->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(ext1->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp1.get()));
-  service->UninstallExtension(
-      bgapp1->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(bgapp1->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
   ASSERT_FALSE(IsBackgroundApp(*ext2.get()));
-  service->UninstallExtension(
-      ext2->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(ext2->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));
-  service->UninstallExtension(
-      bgapp2->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(bgapp2->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
   ASSERT_FALSE(IsBackgroundApp(*ext3.get()));
-  service->UninstallExtension(
-      ext3->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(ext3->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(0U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
 }
 
 // Verifies that pushMessaging also triggers background detection, except
 // when extension is in a whitelist.
 TEST_F(BackgroundApplicationListModelTest, PushMessagingTest) {
   InitializeAndLoadEmptyExtensionService();
   ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->
       extension_service();
@@ skipping 30 matching lines @@
   ASSERT_FALSE(IsBackgroundApp(*ext2.get()));
   service->AddExtension(ext2.get());
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));
   service->AddExtension(bgapp2.get());
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
   // Need to remove ext2 because it uses same id as bgapp3.
   ASSERT_FALSE(IsBackgroundApp(*ext2.get()));
-  service->UninstallExtension(
-      ext2->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(ext2->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp3.get()));
   service->AddExtension(bgapp3.get());
   ASSERT_EQ(4U, service->extensions()->size());
   ASSERT_EQ(3U, model->size());
 
   // Remove in FIFO order.
   ASSERT_FALSE(IsBackgroundApp(*ext1.get()));
-  service->UninstallExtension(
-      ext1->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(ext1->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(3U, service->extensions()->size());
   ASSERT_EQ(3U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp1.get()));
-  service->UninstallExtension(
-      bgapp1->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(bgapp1->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(2U, service->extensions()->size());
   ASSERT_EQ(2U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp2.get()));
-  service->UninstallExtension(
-      bgapp2->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(bgapp2->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(1U, service->extensions()->size());
   ASSERT_EQ(1U, model->size());
   ASSERT_TRUE(IsBackgroundApp(*bgapp3.get()));
-  service->UninstallExtension(
-      bgapp3->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service->UninstallExtension(bgapp3->id(),
+                              extensions::UNINSTALL_REASON_FOR_TESTING,
+                              base::Bind(&base::DoNothing),
+                              NULL);
   ASSERT_EQ(0U, service->extensions()->size());
   ASSERT_EQ(0U, model->size());
 }
 
 // Verifies that an ephemeral app cannot trigger background mode.
 TEST_F(BackgroundApplicationListModelTest, EphemeralAppTest) {
   InitializeAndLoadEmptyExtensionService();
   ExtensionService* service = extensions::ExtensionSystem::Get(profile_.get())->
       extension_service();
   ASSERT_TRUE(service);
@@ skipping 139 matching lines @@
     }
     scoped_refptr<Extension> extension = cursor->get();
     std::string id = extension->id();
     if (BackgroundApplicationListModel::IsBackgroundApp(*extension.get(),
                                                         service->profile())) {
       --*expected;
     }
     extensions->erase(cursor);
     --*count;
     ASSERT_EQ(*count, extensions->size());
-    service->UninstallExtension(
-        extension->id(), extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+    service->UninstallExtension(extension->id(),
+                                extensions::UNINSTALL_REASON_FOR_TESTING,
+                                base::Bind(&base::DoNothing),
+                                NULL);
     ASSERT_EQ(*count, service->extensions()->size());
     ASSERT_EQ(*expected, model->size());
   }
 }
 
 void TogglePermission(ExtensionService* service,
                       ExtensionCollection* extensions,
                       BackgroundApplicationListModel* model,
                       size_t* expected,
                       size_t* count) {
@@ skipping 60 matching lines @@
         break;
       case 2:
         TogglePermission(service, &extensions, model.get(), &expected, &count);
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 }