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

Side by Side Diff: chrome/browser/task_manager/task_manager_browsertest.cc

Issue 1293813005: Change the new-task-manager flag so that the new implementation is enabled by default for all users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix comment Created 5 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include "base/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/browser/browser_process.h" 10 #include "chrome/browser/browser_process.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 if (title == model()->GetResourceTitle(i)) 111 if (title == model()->GetResourceTitle(i))
112 return i; 112 return i;
113 } 113 }
114 return -1; 114 return -1;
115 } 115 }
116 116
117 protected: 117 protected:
118 void SetUpCommandLine(base::CommandLine* command_line) override { 118 void SetUpCommandLine(base::CommandLine* command_line) override {
119 ExtensionBrowserTest::SetUpCommandLine(command_line); 119 ExtensionBrowserTest::SetUpCommandLine(command_line);
120 120
121 // These tests are for the old implementation of the task manager. We must
122 // explicitly disable the new one.
123 task_manager::browsertest_util::EnableOldTaskManager();
124
121 // Do not launch device discovery process. 125 // Do not launch device discovery process.
122 command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications); 126 command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications);
123 } 127 }
124 128
125 private: 129 private:
126 DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserTest); 130 DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserTest);
127 }; 131 };
128 132
129 class TaskManagerUtilityProcessBrowserTest : public TaskManagerBrowserTest { 133 class TaskManagerUtilityProcessBrowserTest : public TaskManagerBrowserTest {
130 public: 134 public:
(...skipping 1072 matching lines...) Expand 10 before | Expand all | Expand 10 after
1203 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); 1207 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
1204 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); 1208 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
1205 1209
1206 HideTaskManager(); 1210 HideTaskManager();
1207 ShowTaskManager(); 1211 ShowTaskManager();
1208 1212
1209 ASSERT_NO_FATAL_FAILURE( 1213 ASSERT_NO_FATAL_FAILURE(
1210 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness"))); 1214 WaitForTaskManagerRows(1, MatchTab("Title Of Awesomeness")));
1211 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe())); 1215 ASSERT_NO_FATAL_FAILURE(WaitForTaskManagerRows(0, MatchAnySubframe()));
1212 } 1216 }
OLDNEW
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/task_manager/task_manager_browsertest_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698