Fix ExtensionServiceTest.ClearExtensionData flakiness

chrome/browser/extensions/extension_message_bubble_controller_unittest.cc

 // Copyright (c) 2013 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 "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/dev_mode_bubble_controller.h"
@@ skipping 702 matching lines @@
     // Only extension 2 should have become disabled.
     EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
     EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
     EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
     // No extension should have been acknowledged (it got disabled).
     EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId1));
     EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId2));
     EXPECT_FALSE(prefs->HasSettingsApiBubbleBeenAcknowledged(kId3));
 
     // Clean up after ourselves.
-    service_->UninstallExtension(
-        kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
-    service_->UninstallExtension(
-        kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
-    service_->UninstallExtension(
-        kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+    service_->UninstallExtension(kId1,
+                                 extensions::UNINSTALL_REASON_FOR_TESTING,
+                                 base::Bind(&base::DoNothing),
+                                 NULL);
+    service_->UninstallExtension(kId2,
+                                 extensions::UNINSTALL_REASON_FOR_TESTING,
+                                 base::Bind(&base::DoNothing),
+                                 NULL);
+    service_->UninstallExtension(kId3,
+                                 extensions::UNINSTALL_REASON_FOR_TESTING,
+                                 base::Bind(&base::DoNothing),
+                                 NULL);
   }
 }
 
 // The feature this is meant to test is only implemented on Windows.
 #if defined(OS_WIN)
 #define MAYBE_NtpOverriddenControllerTest NtpOverriddenControllerTest
 #else
 #define MAYBE_NtpOverriddenControllerTest DISABLED_NtpOverriddenControllerTest
 #endif
 
@@ skipping 76 matching lines @@
   // Only extension 2 should have become disabled.
   EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
   EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
   EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
   // No extension should have been acknowledged (it got disabled).
   EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId1));
   EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId2));
   EXPECT_FALSE(prefs->HasNtpOverriddenBubbleBeenAcknowledged(kId3));
 
   // Clean up after ourselves.
-  service_->UninstallExtension(
-      kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
-  service_->UninstallExtension(
-      kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
-  service_->UninstallExtension(
-      kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service_->UninstallExtension(kId1,
+                               extensions::UNINSTALL_REASON_FOR_TESTING,
+                               base::Bind(&base::DoNothing),
+                               NULL);
+  service_->UninstallExtension(kId2,
+                               extensions::UNINSTALL_REASON_FOR_TESTING,
+                               base::Bind(&base::DoNothing),
+                               NULL);
+  service_->UninstallExtension(kId3,
+                               extensions::UNINSTALL_REASON_FOR_TESTING,
+                               base::Bind(&base::DoNothing),
+                               NULL);
 }
 
 void SetInstallTime(const std::string& extension_id,
                     const base::Time& time,
                     ExtensionPrefs* prefs) {
   std::string time_str = base::Int64ToString(time.ToInternalValue());
   prefs->UpdateExtensionPref(extension_id,
                              "install_time",
                              new base::StringValue(time_str));
 }
@@ skipping 98 matching lines @@
   // Only extension 2 should have become disabled.
   EXPECT_TRUE(registry->enabled_extensions().GetByID(kId1) != NULL);
   EXPECT_TRUE(registry->disabled_extensions().GetByID(kId2) != NULL);
   EXPECT_TRUE(registry->enabled_extensions().GetByID(kId3) != NULL);
   // No extension should have been acknowledged (it got disabled).
   EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId1));
   EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId2));
   EXPECT_FALSE(prefs->HasProxyOverriddenBubbleBeenAcknowledged(kId3));
 
   // Clean up after ourselves.
-  service_->UninstallExtension(
-      kId1, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
-  service_->UninstallExtension(
-      kId2, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
-  service_->UninstallExtension(
-      kId3, extensions::UNINSTALL_REASON_FOR_TESTING, NULL);
+  service_->UninstallExtension(kId1,
+                               extensions::UNINSTALL_REASON_FOR_TESTING,
+                               base::Bind(&base::DoNothing),
+                               NULL);
+  service_->UninstallExtension(kId2,
+                               extensions::UNINSTALL_REASON_FOR_TESTING,
+                               base::Bind(&base::DoNothing),
+                               NULL);
+  service_->UninstallExtension(kId3,
+                               extensions::UNINSTALL_REASON_FOR_TESTING,
+                               base::Bind(&base::DoNothing),
+                               NULL);
 }
 
 }  // namespace extensions