Fix use-after-free issues in UpgradeDetectorImplTest.

chrome/browser/upgrade_detector_impl_unittest.cc

 // Copyright 2014 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/upgrade_detector_impl.h"
 
 #include <vector>
 
 #include "base/macros.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread_bundle.h"
+#include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestUpgradeDetectorImpl : public UpgradeDetectorImpl {
  public:
   TestUpgradeDetectorImpl() : trigger_critical_update_call_count_(0) {}
   ~TestUpgradeDetectorImpl() override {}
 
   // Methods exposed for testing.
   using UpgradeDetectorImpl::OnExperimentChangesDetected;
   using UpgradeDetectorImpl::NotifyOnUpgradeWithTimePassed;
@@ skipping 56 matching lines @@
       variations::VariationsService::Observer::BEST_EFFORT);
   EXPECT_FALSE(detector.notify_upgrade());
   EXPECT_TRUE(notifications_listener.notifications_received().empty());
 
   detector.NotifyOnUpgradeWithTimePassed(base::TimeDelta::FromDays(30));
   EXPECT_TRUE(detector.notify_upgrade());
   ASSERT_EQ(1U, notifications_listener.notifications_received().size());
   EXPECT_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
             notifications_listener.notifications_received().front());
   EXPECT_EQ(0, detector.trigger_critical_update_call_count());
+
+  // Execute tasks sent to FILE thread by |detector| referencing it
+  // while it's still in scope.
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 }
 
 TEST(UpgradeDetectorImplTest, VariationsCriticalChanges) {
   content::TestBrowserThreadBundle bundle;
 
   TestUpgradeNotificationListener notifications_listener;
   TestUpgradeDetectorImpl detector;
   EXPECT_FALSE(detector.notify_upgrade());
   EXPECT_TRUE(notifications_listener.notifications_received().empty());
 
   detector.OnExperimentChangesDetected(
       variations::VariationsService::Observer::CRITICAL);
   EXPECT_FALSE(detector.notify_upgrade());
   EXPECT_TRUE(notifications_listener.notifications_received().empty());
 
   detector.NotifyOnUpgradeWithTimePassed(base::TimeDelta::FromDays(30));
   EXPECT_TRUE(detector.notify_upgrade());
   ASSERT_EQ(1U, notifications_listener.notifications_received().size());
   EXPECT_EQ(chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
             notifications_listener.notifications_received().front());
   EXPECT_EQ(1, detector.trigger_critical_update_call_count());
+
+  // Execute tasks sent to FILE thread by |detector| referencing it
+  // while it's still in scope.
+  content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
 }