| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/environment.h" | 6 #include "base/environment.h" |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 private: | 176 private: |
| 177 void AddLaunchArguments() { | 177 void AddLaunchArguments() { |
| 178 launch_arguments_.AppendSwitch(switches::kEnableLogging); | 178 launch_arguments_.AppendSwitch(switches::kEnableLogging); |
| 179 launch_arguments_.AppendSwitch(switches::kDumpHistogramsOnExit); | 179 launch_arguments_.AppendSwitch(switches::kDumpHistogramsOnExit); |
| 180 launch_arguments_.AppendSwitchASCII(switches::kLoggingLevel, "0"); | 180 launch_arguments_.AppendSwitchASCII(switches::kLoggingLevel, "0"); |
| 181 } | 181 } |
| 182 | 182 |
| 183 DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest); | 183 DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest); |
| 184 }; | 184 }; |
| 185 | 185 |
| 186 TEST_F(TabSwitchingUITest, TabSwitch) { | 186 #if defined(OS_WIN) |
| 187 // Started failing with a webkit roll in r49936. See http://crbug.com/46751 |
| 188 #define MAYBE_TabSwitch FAILS_TabSwitch |
| 189 #define MAYBE_TabSwitchRef FAILS_TabSwitchRef |
| 190 #else |
| 191 #define MAYBE_TabSwitch TabSwitch |
| 192 #define MAYBE_TabSwitchRef TabSwitchRef |
| 193 #endif |
| 194 |
| 195 TEST_F(TabSwitchingUITest, MAYBE_TabSwitch) { |
| 187 RunTabSwitchingUITest("t", true); | 196 RunTabSwitchingUITest("t", true); |
| 188 } | 197 } |
| 189 | 198 |
| 190 TEST_F(TabSwitchingUITest, TabSwitchRef) { | 199 TEST_F(TabSwitchingUITest, MAYBE_TabSwitchRef) { |
| 191 UseReferenceBuild(); | 200 UseReferenceBuild(); |
| 192 RunTabSwitchingUITest("t_ref", true); | 201 RunTabSwitchingUITest("t_ref", true); |
| 193 } | 202 } |
| 194 | 203 |
| 195 } // namespace | 204 } // namespace |
| OLD | NEW |