diff options
author | hashimoto <hashimoto@chromium.org> | 2015-05-15 21:26:57 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-16 04:27:10 +0000 |
commit | c896c5c18f89e2d4201b0bb1155a428d6d43b1ec (patch) | |
tree | 49d97423904ac311e93f4916bfe4c2140d3459be | |
parent | 122d247af7841b388e22b22f0605a1c5b6ca490f (diff) | |
download | chromium_src-c896c5c18f89e2d4201b0bb1155a428d6d43b1ec.zip chromium_src-c896c5c18f89e2d4201b0bb1155a428d6d43b1ec.tar.gz chromium_src-c896c5c18f89e2d4201b0bb1155a428d6d43b1ec.tar.bz2 |
Remove unused ImmediateShutdownAndExitProcess()
This function was used only in application_lifetime.cc.
Since http://crrev.com/307026, this function has been unused.
BUG=None
Review URL: https://codereview.chromium.org/1138863003
Cr-Commit-Position: refs/heads/master@{#330280}
-rw-r--r-- | chrome/browser/lifetime/application_lifetime.cc | 1 | ||||
-rw-r--r-- | content/browser/browser_main_loop.cc | 25 | ||||
-rw-r--r-- | content/content_browser.gypi | 1 | ||||
-rw-r--r-- | content/public/browser/browser_shutdown.h | 30 |
4 files changed, 0 insertions, 57 deletions
diff --git a/chrome/browser/lifetime/application_lifetime.cc b/chrome/browser/lifetime/application_lifetime.cc index 0d80bd1..261e00e 100644 --- a/chrome/browser/lifetime/application_lifetime.cc +++ b/chrome/browser/lifetime/application_lifetime.cc @@ -33,7 +33,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "content/public/browser/browser_shutdown.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_service.h" diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 4d6c6c3..643cd38 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -50,7 +50,6 @@ #include "content/common/host_discardable_shared_memory_manager.h" #include "content/common/host_shared_bitmap_manager.h" #include "content/public/browser/browser_main_parts.h" -#include "content/public/browser/browser_shutdown.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/tracing_controller.h" @@ -336,30 +335,6 @@ base::win::MemoryPressureMonitor* CreateWinMemoryPressureMonitor( // The currently-running BrowserMainLoop. There can be one or zero. BrowserMainLoop* g_current_browser_main_loop = NULL; -// This is just to be able to keep ShutdownThreadsAndCleanUp out of -// the public interface of BrowserMainLoop. -class BrowserShutdownImpl { - public: - static void ImmediateShutdownAndExitProcess() { - DCHECK(g_current_browser_main_loop); - g_current_browser_main_loop->ShutdownThreadsAndCleanUp(); - -#if defined(OS_WIN) - // At this point the message loop is still running yet we've shut everything - // down. If any messages are processed we'll likely crash. Exit now. - ExitProcess(RESULT_CODE_NORMAL_EXIT); -#elif defined(OS_POSIX) && !defined(OS_MACOSX) - _exit(RESULT_CODE_NORMAL_EXIT); -#else - NOTIMPLEMENTED(); -#endif - } -}; - -void ImmediateShutdownAndExitProcess() { - BrowserShutdownImpl::ImmediateShutdownAndExitProcess(); -} - // For measuring memory usage after each task. Behind a command line flag. class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver { public: diff --git a/content/content_browser.gypi b/content/content_browser.gypi index d2f0b0e..63fef96 100644 --- a/content/content_browser.gypi +++ b/content/content_browser.gypi @@ -91,7 +91,6 @@ 'public/browser/browser_plugin_guest_manager.cc', 'public/browser/browser_plugin_guest_manager.h', 'public/browser/browser_ppapi_host.h', - 'public/browser/browser_shutdown.h', 'public/browser/browser_thread.h', 'public/browser/browser_thread_delegate.h', 'public/browser/browser_url_handler.h', diff --git a/content/public/browser/browser_shutdown.h b/content/public/browser/browser_shutdown.h deleted file mode 100644 index 7581533..0000000 --- a/content/public/browser/browser_shutdown.h +++ /dev/null @@ -1,30 +0,0 @@ -// 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. - -#ifndef CONTENT_PUBLIC_BROWSER_BROWSER_SHUTDOWN_H_ -#define CONTENT_PUBLIC_BROWSER_BROWSER_SHUTDOWN_H_ - -#include "content/common/content_export.h" - -namespace content { - -// This can be used for as-fast-as-possible shutdown, in cases where -// time for shutdown is limited and we just need to write out as much -// data as possible before our time runs out. -// -// This causes the shutdown sequence embodied by -// BrowserMainParts::PostMainMessageLoopRun through -// BrowserMainParts::PostDestroyThreads to occur, i.e. we pretend the -// message loop finished, all threads are stopped in sequence and then -// PostDestroyThreads is called. -// -// As this violates the normal order of shutdown, likely leaving the -// process in a bad state, the last thing this function does is -// terminate the process (right after calling -// BrowserMainParts::PostDestroyThreads). -CONTENT_EXPORT void ImmediateShutdownAndExitProcess(); - -} // namespace content - -#endif // CONTENT_PUBLIC_BROWSER_BROWSER_SHUTDOWN_H_ |