chrome/browser/task_management/task_management_browsertest_util.cc - Issue 1374283003: Reporting top cpu and memory consumers via rappor on chromeos

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/task_management/task_management_browsertest_util.cc

Issue 1374283003: Reporting top cpu and memory consumers via rappor on chromeos (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Turn off ResourceReporter on task_management CrOs browser_tests. Created 5 years, 1 month 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

« no previous file with comments | « chrome/browser/task_management/sampling/task_manager_impl.cc ('k') | chrome/browser/task_management/task_manager_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/task_management/task_management_browsertest_util.cc

diff --git a/chrome/browser/task_management/task_management_browsertest_util.cc b/chrome/browser/task_management/task_management_browsertest_util.cc

index a644a5774f60aee889e3988e8e588e724123f774..3fb1810d710db8451858c331f41abc31a560062f 100644

--- a/chrome/browser/task_management/task_management_browsertest_util.cc

+++ b/chrome/browser/task_management/task_management_browsertest_util.cc

@@ -6,6 +6,10 @@

#include "base/stl_util.h"

+#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"

+#endif // defined(OS_CHROMEOS)

namespace task_management {

MockWebContentsTaskManager::MockWebContentsTaskManager()

@@ -29,6 +33,12 @@ void MockWebContentsTaskManager::TaskRemoved(Task* task) {

}

void MockWebContentsTaskManager::StartObserving() {

+#if defined(OS_CHROMEOS)

+ // On ChromeOS, the ResourceReporter needs to be turned off so as not to

+ // interfere with the tests.

+ chromeos::ResourceReporter::GetInstance()->StopMonitoring();

+#endif // defined(OS_CHROMEOS)

provider_.SetObserver(this);

}