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

Side by Side 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 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_management/task_management_browsertest_util.h" 5 #include "chrome/browser/task_management/task_management_browsertest_util.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 8
9 #if defined(OS_CHROMEOS)
10 #include "chrome/browser/chromeos/resource_reporter/resource_reporter.h"
11 #endif // defined(OS_CHROMEOS)
12
9 namespace task_management { 13 namespace task_management {
10 14
11 MockWebContentsTaskManager::MockWebContentsTaskManager() 15 MockWebContentsTaskManager::MockWebContentsTaskManager()
12 : tasks_(), 16 : tasks_(),
13 provider_() { 17 provider_() {
14 } 18 }
15 19
16 MockWebContentsTaskManager::~MockWebContentsTaskManager() { 20 MockWebContentsTaskManager::~MockWebContentsTaskManager() {
17 } 21 }
18 22
19 void MockWebContentsTaskManager::TaskAdded(Task* task) { 23 void MockWebContentsTaskManager::TaskAdded(Task* task) {
20 DCHECK(task); 24 DCHECK(task);
21 DCHECK(!ContainsValue(tasks_, task)); 25 DCHECK(!ContainsValue(tasks_, task));
22 tasks_.push_back(task); 26 tasks_.push_back(task);
23 } 27 }
24 28
25 void MockWebContentsTaskManager::TaskRemoved(Task* task) { 29 void MockWebContentsTaskManager::TaskRemoved(Task* task) {
26 DCHECK(task); 30 DCHECK(task);
27 DCHECK(ContainsValue(tasks_, task)); 31 DCHECK(ContainsValue(tasks_, task));
28 tasks_.erase(std::find(tasks_.begin(), tasks_.end(), task)); 32 tasks_.erase(std::find(tasks_.begin(), tasks_.end(), task));
29 } 33 }
30 34
31 void MockWebContentsTaskManager::StartObserving() { 35 void MockWebContentsTaskManager::StartObserving() {
36 #if defined(OS_CHROMEOS)
37 // On ChromeOS, the ResourceReporter needs to be turned off so as not to
38 // interfere with the tests.
39 chromeos::ResourceReporter::GetInstance()->StopMonitoring();
40 #endif // defined(OS_CHROMEOS)
41
32 provider_.SetObserver(this); 42 provider_.SetObserver(this);
33 } 43 }
34 44
35 void MockWebContentsTaskManager::StopObserving() { 45 void MockWebContentsTaskManager::StopObserving() {
36 provider_.ClearObserver(); 46 provider_.ClearObserver();
37 } 47 }
38 48
39 } // namespace task_management 49 } // namespace task_management
OLDNEW
« 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 »

Powered by Google App Engine
This is Rietveld 408576698