Revert 65010 - Adding OOM priority management for renderers on ChromeOS.

Reverting because this causes problems on valgrind (for ChromeOS only).

Turns out that TabStripModel is not thread safe, and I'm calling from
another thread.

Review URL: http://codereview.chromium.org/4446002

TBR=gspencer@chromium.org
Review URL: http://codereview.chromium.org/4417006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65091 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 15 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 036c33a..2452da3 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -110,7 +110,6 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/boot_times_loader.h"
-#include "chrome/browser/oom_priority_manager.h"
 #endif
 
 // TODO(port): several win-only methods have been pulled out of this, but
@@ -1451,9 +1450,9 @@ int BrowserMain(const MainFunctionParams& parameters) {
   bool record_search_engine = is_first_run && !profile->IsOffTheRecord();
 #endif
 
-  // ChildProcess:: is a misnomer unless you consider context.  Use
-  // of --wait-for-debugger only makes sense when Chrome itself is a
-  // child process (e.g. when launched by PyAuto).
+    // ChildProcess:: is a misnomer unless you consider context.  Use
+    // of --wait-for-debugger only makes sense when Chrome itself is a
+    // child process (e.g. when launched by PyAuto).
   if (parsed_command_line.HasSwitch(switches::kWaitForDebugger)) {
     ChildProcess::WaitForDebugger(L"Browser");
   }
@@ -1471,17 +1470,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
     }
   }
 
-#if defined(OS_CHROMEOS)
-  // Run the Out of Memory priority manager while in this scope.  Wait
-  // until here to start so that we give the most amount of time for
-  // the other services to start up before we start adjusting the oom
-  // priority.  In reality, it doesn't matter much where in this scope
-  // this is started, but it must be started in this scope so it will
-  // also be terminated when this scope exits.
-  scoped_ptr<browser::OomPriorityManager> oom_priority_manager(
-      new browser::OomPriorityManager);
-#endif
-
   // Create the instance of the cloud print proxy service so that it can launch
   // the service process if needed. This is needed because the service process
   // might have shutdown because an update was available.