| OLD | NEW |
| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 protected: | 97 protected: |
| 98 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 98 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 99 ExtensionBrowserTest::SetUpCommandLine(command_line); | 99 ExtensionBrowserTest::SetUpCommandLine(command_line); |
| 100 | 100 |
| 101 // Do not prelaunch the GPU process and disable accelerated compositing | 101 // Do not prelaunch the GPU process and disable accelerated compositing |
| 102 // for these tests as the GPU process will show up in task manager but | 102 // for these tests as the GPU process will show up in task manager but |
| 103 // whether it appears before or after the new tab renderer process is not | 103 // whether it appears before or after the new tab renderer process is not |
| 104 // well defined. | 104 // well defined. |
| 105 command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch); | 105 command_line->AppendSwitch(switches::kDisableGpuProcessPrelaunch); |
| 106 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); | 106 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); |
| 107 |
| 108 // Do not launch device discovery process. |
| 109 command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications); |
| 107 } | 110 } |
| 108 | 111 |
| 109 private: | 112 private: |
| 110 DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserTest); | 113 DISALLOW_COPY_AND_ASSIGN(TaskManagerBrowserTest); |
| 111 }; | 114 }; |
| 112 | 115 |
| 113 #if defined(OS_MACOSX) || defined(OS_LINUX) | 116 #if defined(OS_MACOSX) || defined(OS_LINUX) |
| 114 #define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen | 117 #define MAYBE_ShutdownWhileOpen DISABLED_ShutdownWhileOpen |
| 115 #else | 118 #else |
| 116 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen | 119 #define MAYBE_ShutdownWhileOpen ShutdownWhileOpen |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 501 DevToolsWindow* dev_tools = DevToolsWindow::ToggleDevToolsWindow( | 504 DevToolsWindow* dev_tools = DevToolsWindow::ToggleDevToolsWindow( |
| 502 model()->GetResourceWebContents(1)->GetRenderViewHost(), | 505 model()->GetResourceWebContents(1)->GetRenderViewHost(), |
| 503 true, | 506 true, |
| 504 DEVTOOLS_TOGGLE_ACTION_INSPECT); | 507 DEVTOOLS_TOGGLE_ACTION_INSPECT); |
| 505 // Dock side bottom should be the default. | 508 // Dock side bottom should be the default. |
| 506 ASSERT_EQ(DEVTOOLS_DOCK_SIDE_BOTTOM, dev_tools->dock_side()); | 509 ASSERT_EQ(DEVTOOLS_DOCK_SIDE_BOTTOM, dev_tools->dock_side()); |
| 507 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); | 510 TaskManagerBrowserTestUtil::WaitForWebResourceChange(2); |
| 508 } | 511 } |
| 509 | 512 |
| 510 #endif | 513 #endif |
| OLD | NEW |