Clear testing callbacks in AppBackgrounPageNaclTest reentrantly.

chrome/browser/extensions/app_background_page_apitest.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 "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/background/background_contents_service.h"
 #include "chrome/browser/background/background_contents_service_factory.h"
 #include "chrome/browser/background/background_mode_manager.h"
@@ skipping 138 matching lines @@
 
  private:
   base::FilePath app_dir_;
   const Extension* extension_;
 };
 
 // Produces an extensions::ProcessManager::ImpulseCallbackForTesting callback
 // that will match a specified goal and can be waited on.
 class ImpulseCallbackCounter {
  public:
-  explicit ImpulseCallbackCounter(const std::string& extension_id)
+  explicit ImpulseCallbackCounter(extensions::ProcessManager* manager,
+                                  const std::string& extension_id)
       : observed_(0),
         goal_(0),
+        manager_(manager),
         extension_id_(extension_id) {
   }
 
   extensions::ProcessManager::ImpulseCallbackForTesting
       SetGoalAndGetCallback(int goal) {
     observed_ = 0;
     goal_ = goal;
     message_loop_runner_ = new content::MessageLoopRunner();
     return base::Bind(&ImpulseCallbackCounter::ImpulseCallback,
                       base::Unretained(this),
                       message_loop_runner_->QuitClosure(),
                       extension_id_);
   }
 
   void Wait() {
     message_loop_runner_->Run();
   }
  private:
   void ImpulseCallback(
       const base::Closure& quit_callback,
       const std::string& extension_id_from_test,
       const std::string& extension_id_from_manager) {
     if (extension_id_from_test == extension_id_from_manager) {
       if (++observed_ >= goal_) {
+        // Clear callback to free reference to message loop.
+        manager_->SetKeepaliveImpulseCallbackForTesting(
+            extensions::ProcessManager::ImpulseCallbackForTesting());
+        manager_->SetKeepaliveImpulseDecrementCallbackForTesting(
+            extensions::ProcessManager::ImpulseCallbackForTesting());
         quit_callback.Run();
       }
     }
   }
 
   int observed_;
   int goal_;
+  extensions::ProcessManager* manager_;
   const std::string extension_id_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 };
 
 }  // namespace
 
 // Disable on Mac only.  http://crbug.com/95139
 #if defined(OS_MACOSX)
 #define MAYBE_Basic DISABLED_Basic
 #else
@@ skipping 387 matching lines @@
   content::RunAllPendingInMessageLoop();
   ASSERT_TRUE(WaitForBackgroundMode(false));
 }
 
 // Verify active NaCl embeds cause many keepalive impulses to be sent.
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageNaClTest, BackgroundKeepaliveActive) {
   ExtensionTestMessageListener nacl_modules_loaded("nacl_modules_loaded", true);
   LaunchTestingApp();
   extensions::ProcessManager* manager =
     extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
-  ImpulseCallbackCounter active_impulse_counter(extension()->id());
+  ImpulseCallbackCounter active_impulse_counter(manager, extension()->id());
   EXPECT_TRUE(nacl_modules_loaded.WaitUntilSatisfied());
 
   // Target .5 seconds: .5 seconds / 50ms throttle * 2 embeds == 20 impulses.
   manager->SetKeepaliveImpulseCallbackForTesting(
       active_impulse_counter.SetGoalAndGetCallback(20));
   active_impulse_counter.Wait();
-
-  // Clear callback to free reference to message loop in ImpulseCallbackCounter.
-  manager->SetKeepaliveImpulseCallbackForTesting(
-      extensions::ProcessManager::ImpulseCallbackForTesting());
 }
 
 // Verify that nacl modules that go idle will not send keepalive impulses.
 // Disabled on windows due to Win XP failures:
 // DesktopWindowTreeHostWin::HandleCreate not implemented. crbug.com/331954
 #if defined(OS_WIN)
 #define MAYBE_BackgroundKeepaliveIdle DISABLED_BackgroundKeepaliveIdle
 #else
 #define MAYBE_BackgroundKeepaliveIdle BackgroundKeepaliveIdle
 #endif
 IN_PROC_BROWSER_TEST_F(AppBackgroundPageNaClTest,
                        MAYBE_BackgroundKeepaliveIdle) {
   ExtensionTestMessageListener nacl_modules_loaded("nacl_modules_loaded", true);
   LaunchTestingApp();
   extensions::ProcessManager* manager =
     extensions::ExtensionSystem::Get(browser()->profile())->process_manager();
-  ImpulseCallbackCounter idle_impulse_counter(extension()->id());
+  ImpulseCallbackCounter idle_impulse_counter(manager, extension()->id());
   EXPECT_TRUE(nacl_modules_loaded.WaitUntilSatisfied());
 
   manager->SetKeepaliveImpulseDecrementCallbackForTesting(
       idle_impulse_counter.SetGoalAndGetCallback(1));
   nacl_modules_loaded.Reply("be idle");
   idle_impulse_counter.Wait();
-
-  // Clear callback to free reference to message loop in ImpulseCallbackCounter.
-  manager->SetKeepaliveImpulseDecrementCallbackForTesting(
-      extensions::ProcessManager::ImpulseCallbackForTesting());
 }