Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3249)

Unified Diff: chrome/browser/task_manager/task_manager_browsertest_util.cc

Issue 10882071: Fixes for bunch of browser tests that are trying to load content from file: schema. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/task_manager/task_manager_browsertest_util.cc
diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc
index 1a19ab59d8ed6fb948b521a6167917b471211c1f..f2293a04133a03f17643a8afb108c946cd2e2f20 100644
--- a/chrome/browser/task_manager/task_manager_browsertest_util.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc
@@ -3,6 +3,8 @@
// found in the LICENSE file.
#include "base/message_loop.h"
+#include "base/stringprintf.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/task_manager/task_manager.h"
@@ -12,9 +14,30 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/notification_source.h"
+#include "content/public/browser/web_contents.h"
namespace {
+int GetWebResourceCount(const TaskManagerModel* model) {
+ int count = 0;
+ for (int i = 0; i < model->ResourceCount(); i++) {
+ TaskManager::Resource::Type type = model->GetResourceType(i);
+ // Skip system infrastructure resources.
+ if (type == TaskManager::Resource::BROWSER ||
+ type == TaskManager::Resource::NACL ||
+ type == TaskManager::Resource::GPU ||
+ type == TaskManager::Resource::UTILITY ||
+ type == TaskManager::Resource::PROFILE_IMPORT ||
+ type == TaskManager::Resource::ZYGOTE ||
+ type == TaskManager::Resource::SANDBOX_HELPER) {
+ continue;
+ }
+
+ count++;
+ }
+ return count;
+}
+
class ResourceChangeObserver : public TaskManagerModelObserver {
public:
ResourceChangeObserver(const TaskManagerModel* model,
@@ -41,7 +64,7 @@ class ResourceChangeObserver : public TaskManagerModelObserver {
private:
void OnResourceChange() {
- if (model_->ResourceCount() == target_resource_count_)
+ if (GetWebResourceCount(model_) == target_resource_count_)
MessageLoopForUI::current()->Quit();
}
@@ -52,7 +75,7 @@ class ResourceChangeObserver : public TaskManagerModelObserver {
} // namespace
// static
-void TaskManagerBrowserTestUtil::WaitForResourceChange(int target_count) {
+void TaskManagerBrowserTestUtil::WaitForWebResourceChange(int target_count) {
TaskManagerModel* model = TaskManager::GetInstance()->model();
ResourceChangeObserver observer(model, target_count);
@@ -61,7 +84,7 @@ void TaskManagerBrowserTestUtil::WaitForResourceChange(int target_count) {
// Checks that the condition has not been satisfied yet.
// This check has to be placed after the installation of the observer,
// because resources may change before that.
- if (model->ResourceCount() == target_count) {
+ if (GetWebResourceCount(model) == target_count) {
model->RemoveObserver(&observer);
return;
}

Powered by Google App Engine
This is Rietveld 408576698