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

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

Issue 10914247: Enable by default threaded compositing on windows and FCM on mac (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: mac and linux get fcm with 30% probability Created 8 years, 2 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/file_path.h" 7 #include "base/file_path.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/utf_string_conversions.h" 9 #include "base/utf_string_conversions.h"
10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h" 10 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 class TaskManagerBrowserTest : public ExtensionBrowserTest { 61 class TaskManagerBrowserTest : public ExtensionBrowserTest {
62 public: 62 public:
63 TaskManagerModel* model() const { 63 TaskManagerModel* model() const {
64 return TaskManager::GetInstance()->model(); 64 return TaskManager::GetInstance()->model();
65 } 65 }
66 protected: 66 protected:
67 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { 67 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
68 ExtensionBrowserTest::SetUpCommandLine(command_line); 68 ExtensionBrowserTest::SetUpCommandLine(command_line);
69 69
70 // Do not prelaunch the GPU process for these tests because it will show 70 // Do not prelaunch the GPU process and disable accelerated compositing
71 // up in task manager but whether it appears before or after the new tab 71 // for these tests as the GPU process will show up in task manager but
72 // renderer process is not well defined. 72 // whether it appears before or after the new tab renderer process is not
73 // well defined.
73 command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch); 74 command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch);
75 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing);
74 } 76 }
75 }; 77 };
76 78
77 #if defined(OS_MACOSX) || defined(OS_LINUX) 79 #if defined(OS_MACOSX) || defined(OS_LINUX)
78 #define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen 80 #define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen
79 #else 81 #else
80 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen 82 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen
81 #endif 83 #endif
82 84
83 // Regression test for http://crbug.com/13361 85 // Regression test for http://crbug.com/13361
(...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after
554 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); 556 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2);
555 557
556 // Check that we get some value for the cache columns. 558 // Check that we get some value for the cache columns.
557 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count), 559 DCHECK_NE(model()->GetResourceWebCoreImageCacheSize(resource_count),
558 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 560 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
559 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count), 561 DCHECK_NE(model()->GetResourceWebCoreScriptsCacheSize(resource_count),
560 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 562 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
561 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count), 563 DCHECK_NE(model()->GetResourceWebCoreCSSCacheSize(resource_count),
562 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT)); 564 l10n_util::GetStringUTF16(IDS_TASK_MANAGER_NA_CELL_TEXT));
563 } 565 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_tabs_apitest.cc ('k') | chrome/test/gpu/gpu_feature_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698