WebUI TaskManager: make it default on Chrome OS

chrome/browser/task_manager/task_manager_browsertest_util.h

Index: chrome/browser/task_manager/task_manager_browsertest_util.h
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.h b/chrome/browser/task_manager/task_manager_browsertest_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..eb871f7f41446b62a6850c53612f400dee4ab61f
--- /dev/null
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.h
@@ -0,0 +1,131 @@
+// 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_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
+#define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
+#pragma once
+
+#include "base/message_loop.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/task_manager/task_manager.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "chrome/test/ui_test_utils.h"
+#include "content/common/notification_source.h"
+
+namespace {
+
+class ResourceChangeObserver : public TaskManagerModelObserver {

[xiyuan, 2011/07/29 18:04:56]

nit: Is ResourceChangeObserver used anywhere else? If not, suggest to move it to
a cc file.

+ public:
+  ResourceChangeObserver(const TaskManagerModel* model,
+                         int target_resource_count)
+      : model_(model),
+        target_resource_count_(target_resource_count) {
+  }
+
+  virtual void OnModelChanged() {

[xiyuan, 2011/07/29 18:04:56]

nit: OVERRIDE and other virtual functions below.

+    OnResourceChange();
+  }
+
+  virtual void OnItemsChanged(int start, int length) {
+    OnResourceChange();
+  }
+
+  virtual void OnItemsAdded(int start, int length) {
+    OnResourceChange();
+  }
+
+  virtual void OnItemsRemoved(int start, int length) {
+    OnResourceChange();
+  }
+
+ private:
+  void OnResourceChange() {
+    if (model_->ResourceCount() == target_resource_count_)
+      MessageLoopForUI::current()->Quit();
+  }
+
+  const TaskManagerModel* model_;
+  const int target_resource_count_;
+};
+
+// Helper class used to wait for a TaskManager to be ready.
+class TaskManagerReadyListener : public NotificationObserver {

[xiyuan, 2011/07/29 18:04:56]

nit: If TaskManagerReadyListener not used anywhere else, suggest to move it inot
a cc file.

+ public:
+  explicit TaskManagerReadyListener(TaskManagerModel* model) {
+    registrar_.Add(this, chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY,
+                   Source<TaskManagerModel>(model));
+      LOG(ERROR) << "added";

[xiyuan, 2011/07/29 18:04:56]

nit: remove this LOG or fix indentation

+  }
+  virtual void Observe(int type,

[xiyuan, 2011/07/29 18:04:56]

nit: insert an empty line before

+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    // Quit once the BackgroundContents has been loaded.
+    if (type == chrome::NOTIFICATION_TASK_MANAGER_WINDOW_READY)
+      MessageLoopForUI::current()->Quit();
+      LOG(ERROR) << "Observed";

[xiyuan, 2011/07/29 18:04:56]

nit: remove this LOG or fix the indentation.

+  }
+ private:
+  NotificationRegistrar registrar_;
+};
+
+// Helper class used to wait for a BackgroundContents to finish loading.
+class BackgroundContentsListener : public NotificationObserver {
+ public:
+  explicit BackgroundContentsListener(Profile* profile) {
+    registrar_.Add(this, chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED,
+                   Source<Profile>(profile));
+  }
+  virtual void Observe(int type,

[xiyuan, 2011/07/29 18:04:56]

nit: insert an empty line before

+                       const NotificationSource& source,
+                       const NotificationDetails& details) {
+    // Quit once the BackgroundContents has been loaded.
+    if (type == chrome::NOTIFICATION_BACKGROUND_CONTENTS_NAVIGATED)
+      MessageLoopForUI::current()->Quit();
+  }
+
+  void ShowTaskManagerAndWait() {
+    ui_test_utils::RunMessageLoop();
+  }
+
+ private:
+  NotificationRegistrar registrar_;
+};
+
+}  // namespace
+
+class TaskManagerBrowserTestUtil {
+ public:
+  static void WaitForResourceChange(int target_count) {
+    TaskManagerModel* model = TaskManager::GetInstance()->model();
+
+    if (model->ResourceCount() == target_count)
+      return;
+    ResourceChangeObserver observer(model, target_count);
+    model->AddObserver(&observer);
+    ui_test_utils::RunMessageLoop();
+    model->RemoveObserver(&observer);
+  }
+
+  static void ShowTaskManagerAndWaitForReady(Browser* browser) {
+#if defined(WEBUI_TASK_MANAGER)
+    TaskManagerReadyListener listener(TaskManager::GetInstance()->model());
+    browser->window()->ShowTaskManager();
+    ui_test_utils::RunMessageLoop();
+#else
+    browser->window()->ShowTaskManager();
+#endif  // defined(WEBUI_TASK_MANAGER)
+  }
+
+  // Wait for any pending BackgroundContents to finish starting up.
+  static void WaitForBackgroundContents(Browser* browser) {
+    BackgroundContentsListener listener(browser->profile());
+    ui_test_utils::RunMessageLoop();
+  }
+};
+
+#endif  // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_BROWSERTEST_UTIL_H_
+

[mazda, 2011/07/29 18:20:38]

redundant line?