Revert 160144 - Add calls to inform gpu of browser window count

BUG=146448
TEST=None

Review URL: https://codereview.chromium.org/11026015

TBR=davemoore@chromium.org
Review URL: https://codereview.chromium.org/11030029

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

3 files changed, 0 insertions, 69 deletions

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index f467e00..e504234 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -34,7 +34,6 @@
 #include "chrome/browser/browser_process_impl.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
-#include "chrome/browser/chrome_gpu_util.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -930,7 +929,6 @@ void ChromeBrowserMainParts::PostProfileInit() {
 void ChromeBrowserMainParts::PreBrowserStart() {
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PreBrowserStart();
-  gpu_util::InstallBrowserMonitor();
 }
 
 void ChromeBrowserMainParts::PostBrowserStart() {
@@ -1396,7 +1394,6 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
   std::vector<Profile*> last_opened_profiles =
       g_browser_process->profile_manager()->GetLastOpenedProfiles();
 #endif
-
   if (browser_creator_->Start(parsed_command_line(), FilePath(),
                               profile_, last_opened_profiles, &result_code)) {
 #if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
@@ -1529,8 +1526,6 @@ void ChromeBrowserMainParts::PostMainMessageLoopRun() {
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostMainMessageLoopRun();
 
-  gpu_util::UninstallBrowserMonitor();
-
 #if defined(OS_WIN)
   // Log the search engine chosen on first run. Do this at shutdown, after any
   // changes are made from the first run bubble link, etc.
diff --git a/chrome/browser/chrome_gpu_util.cc b/chrome/browser/chrome_gpu_util.cc
index 09cfb2f..b4221ec 100644
--- a/chrome/browser/chrome_gpu_util.cc
+++ b/chrome/browser/chrome_gpu_util.cc
@@ -11,9 +11,6 @@
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
-#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/browser_list_observer.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/gpu_data_manager.h"
@@ -24,54 +21,6 @@ using content::GpuDataManager;
 
 namespace gpu_util {
 
-// The BrowserMonitor class is used to track the number of currently open
-// browser windows, so that the gpu can be notified when they are created or
-// destroyed. We only count tabbed windows for this purpose.
-class BrowserMonitor : public chrome::BrowserListObserver {
- public:
-  static BrowserMonitor* GetInstance() {
-    static BrowserMonitor* instance = NULL;
-    if (!instance)
-      instance = new BrowserMonitor;
-    return instance;
-  }
-
-  void Install() {
-    if (!installed_) {
-      BrowserList::AddObserver(this);
-      installed_ = true;
-    }
-  }
-
-  void Uninstall() {
-    if (installed_) {
-      BrowserList::RemoveObserver(this);
-      installed_ = false;
-    }
-  }
-
- private:
-  BrowserMonitor() : num_browsers_(0), installed_(false) {
-  }
-
-  ~BrowserMonitor() {
-  }
-
-  // BrowserListObserver implementation.
-  virtual void OnBrowserAdded(Browser* browser) OVERRIDE {
-    if (browser->type() == Browser::TYPE_TABBED)
-      content::GpuDataManager::GetInstance()->SetWindowCount(++num_browsers_);
-  }
-
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE {
-    if (browser->type() == Browser::TYPE_TABBED)
-      content::GpuDataManager::GetInstance()->SetWindowCount(--num_browsers_);
-  }
-
-  uint32 num_browsers_;
-  bool installed_;
-};
-
 bool ShouldRunStage3DFieldTrial() {
 #if !defined(OS_WIN)
   return false;
@@ -208,13 +157,5 @@ void InitializeCompositingFieldTrial() {
   UMA_HISTOGRAM_BOOLEAN("GPU.InCompositorThreadFieldTrial", thread);
 }
 
-void InstallBrowserMonitor() {
-  BrowserMonitor::GetInstance()->Install();
-}
-
-void UninstallBrowserMonitor() {
-  BrowserMonitor::GetInstance()->Uninstall();
-}
-
 }  // namespace gpu_util;
 
diff --git a/chrome/browser/chrome_gpu_util.h b/chrome/browser/chrome_gpu_util.h
index def8fcb..a4f9efc 100644
--- a/chrome/browser/chrome_gpu_util.h
+++ b/chrome/browser/chrome_gpu_util.h
@@ -13,11 +13,6 @@ void InitializeStage3DFieldTrial();
 // Sets up force-compositing-mode and threaded compositing field trials.
 void InitializeCompositingFieldTrial();
 
-// Sets up a monitor for browser windows, to be used to determine gpu
-// managed memory allocation.
-void InstallBrowserMonitor();
-void UninstallBrowserMonitor();
-
 }  // namespace gpu_util
 
 #endif  // CHROME_BROWSER_CHROME_GPU_UTIL_H_