Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive

chrome/browser/extensions/api/preference/preference_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/bind_helpers.h"
 #include "base/location.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_apitest.h"
+#include "chrome/browser/lifetime/keep_alive_types.h"
+#include "chrome/browser/lifetime/scoped_keep_alive.h"
 #include "chrome/browser/net/prediction_options.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
 #include "components/translate/core/common/translate_pref_names.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/webrtc_ip_handling_policy.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/test/extension_test_message_listener.h"
 #include "extensions/test/result_catcher.h"
 
-namespace {
-
-void ReleaseBrowserProcessModule() {
-  g_browser_process->ReleaseModule();
-}
-
-}  // namespace
-
 class ExtensionPreferenceApiTest : public ExtensionApiTest {
  protected:
   ExtensionPreferenceApiTest() : profile_(NULL) {}
 
   void CheckPreferencesSet() {
     PrefService* prefs = profile_->GetPrefs();
     const PrefService::Preference* pref = prefs->FindPreference(
         prefs::kBlockThirdPartyCookies);
     ASSERT_TRUE(pref);
     EXPECT_TRUE(pref->IsExtensionControlled());
@@ skipping 34 matching lines @@
   void SetUpOnMainThread() override {
     ExtensionApiTest::SetUpOnMainThread();
 
     // The browser might get closed later (and therefore be destroyed), so we
     // save the profile.
     profile_ = browser()->profile();
 
     // Closing the last browser window also releases a module reference. Make
     // sure it's not the last one, so the message loop doesn't quit
     // unexpectedly.
-    g_browser_process->AddRefModule();
+    keep_alive_.reset(new ScopedKeepAlive(KeepAliveOrigin::BROWSER,
+                                          KeepAliveRestartOption::DISABLED));
   }
 
   void TearDownOnMainThread() override {
-    // ReleaseBrowserProcessModule() needs to be called in a message loop, so we
-    // post a task to do it, then run the message loop.
+    // BrowserProcess::Shutdown() needs to be called in a message loop, so we
+    // post a task to release the keep alive, then run the message loop.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&ReleaseBrowserProcessModule));
+        FROM_HERE, base::Bind(&scoped_ptr<ScopedKeepAlive>::reset,
+                              base::Unretained(&keep_alive_), nullptr));
     content::RunAllPendingInMessageLoop();
 
     ExtensionApiTest::TearDownOnMainThread();
   }
 
   Profile* profile_;
+  scoped_ptr<ScopedKeepAlive> keep_alive_;
 };
 
 // http://crbug.com/177163
 #if defined(OS_WIN) && !defined(NDEBUG)
 #define MAYBE_Standard DISABLED_Standard
 #else
 #define MAYBE_Standard Standard
 #endif
 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_Standard) {
   PrefService* prefs = profile_->GetPrefs();
@@ skipping 225 matching lines @@
   listener_incognito10.Reply("ok");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message();
 }
 
 IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, DataReductionProxy) {
   EXPECT_TRUE(RunExtensionTest("preference/data_reduction_proxy")) <<
       message_;
 }