Revert "chromeos: move screen lock handling to power manager client"

chrome/browser/chrome_browser_main.h

 // Copyright (c) 2011 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 CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
@@ skipping 38 matching lines @@
   virtual ~ChromeBrowserMainParts();
 
   // Add additional ChromeBrowserMainExtraParts.
   virtual void AddParts(ChromeBrowserMainExtraParts* parts);
 
  protected:
   explicit ChromeBrowserMainParts(
       const content::MainFunctionParams& parameters);
 
   // content::BrowserMainParts overrides.
-  // These are called in-order by content::BrowserMainLoop.
-  // Each stage calls the same stages in any ChromeBrowserMainExtraParts added
-  // with AddParts() from ChromeContentBrowserClient::CreateBrowserMainParts.
   virtual void PreEarlyInitialization() OVERRIDE;
   virtual void PostEarlyInitialization() OVERRIDE;
   virtual void ToolkitInitialized() OVERRIDE;
   virtual void PreMainMessageLoopStart() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE;
   virtual void PreCreateThreads() OVERRIDE;
   virtual void PreStartThread(content::BrowserThread::ID identifier) OVERRIDE;
   virtual void PostStartThread(content::BrowserThread::ID identifier) OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun() OVERRIDE;
   virtual void PreStopThread(content::BrowserThread::ID identifier) OVERRIDE;
   virtual void PostStopThread(content::BrowserThread::ID identifier) OVERRIDE;
   virtual void PostDestroyThreads() OVERRIDE;
 
-  // Additional stages for ChromeBrowserMainExtraParts. These stages are called
-  // in order from PreMainMessageLoopStart(). See implementation for details.
-  virtual void PreProfileInit();
-  virtual void PostProfileInit();
-  virtual void PreBrowserStart();
-  virtual void PostBrowserStart();
-
   // Displays a warning message that we can't find any locale data files.
   virtual void ShowMissingLocaleMessageBox() = 0;
 
   const content::MainFunctionParams& parameters() const {
     return parameters_;
   }
   const CommandLine& parsed_command_line() const {
     return parsed_command_line_;
   }
 
   Profile* profile() { return profile_; }
-  MetricsService* metrics() { return metrics_; }
 
  private:
   // Methods for |EarlyInitialization()| ---------------------------------------
 
   // A/B test for the maximum number of persistent connections per host.
   void ConnectionFieldTrial();
 
   // A/B test for determining a value for unused socket timeout.
   void SocketTimeoutFieldTrial();
 
@@ skipping 114 matching lines @@
 // Records the time from our process' startup to the present time in
 // the UMA histogram |metric_name|.
 void RecordBrowserStartupTime();
 
 // Records a time value to an UMA histogram in the context of the
 // PreReadExperiment field-trial. This also reports to the appropriate
 // sub-histogram (_PreRead(Enabled|Disabled)).
 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time);
 
 #endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_