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

    
This reverts commit f9f5f14c3ecf810409509b92a0b694850050e74e.

Revert "Move chromeos specific code to ChromeBrowserMainPartsChromeos"
    
This reverts commit 922cff9cd081e3ae327b52d3cc6bd8423307dee0.

Revert "chromeos: remove power manager EXPECTs from login_browsertest"
    
This reverts commit 0a9298b6333f5a373ddd316978f0aa469ef20ce7.



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

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

1 files changed, 0 insertions, 11 deletions

diff --git a/chrome/browser/chrome_browser_main.h b/chrome/browser/chrome_browser_main.h
index 93bf58f..26f22a6 100644
--- a/chrome/browser/chrome_browser_main.h
+++ b/chrome/browser/chrome_browser_main.h
@@ -56,9 +56,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
       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;
@@ -74,13 +71,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   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;
 
@@ -92,7 +82,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   }
 
   Profile* profile() { return profile_; }
-  MetricsService* metrics() { return metrics_; }
 
  private:
   // Methods for |EarlyInitialization()| ---------------------------------------