OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/file_path.h" | 6 #include "base/file_path.h" |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/platform_thread.h" | 9 #include "base/platform_thread.h" |
10 #include "base/time.h" | 10 #include "base/time.h" |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
167 } | 167 } |
168 | 168 |
169 FilePath path_prefix_; | 169 FilePath path_prefix_; |
170 FilePath log_file_name_; | 170 FilePath log_file_name_; |
171 scoped_refptr<BrowserProxy> browser_proxy_; | 171 scoped_refptr<BrowserProxy> browser_proxy_; |
172 | 172 |
173 private: | 173 private: |
174 void AddLaunchArguments() { | 174 void AddLaunchArguments() { |
175 launch_arguments_.AppendSwitch(switches::kEnableLogging); | 175 launch_arguments_.AppendSwitch(switches::kEnableLogging); |
176 launch_arguments_.AppendSwitch(switches::kDumpHistogramsOnExit); | 176 launch_arguments_.AppendSwitch(switches::kDumpHistogramsOnExit); |
177 launch_arguments_.AppendSwitchWithValue(switches::kLoggingLevel, "0"); | 177 launch_arguments_.AppendSwitchASCII(switches::kLoggingLevel, "0"); |
178 } | 178 } |
179 | 179 |
180 DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest); | 180 DISALLOW_COPY_AND_ASSIGN(TabSwitchingUITest); |
181 }; | 181 }; |
182 | 182 |
183 #if defined(OS_WIN) | 183 #if defined(OS_WIN) |
184 // Started failing with a webkit roll in r49936. See http://crbug.com/46751 | 184 // Started failing with a webkit roll in r49936. See http://crbug.com/46751 |
185 #define MAYBE_TabSwitch FAILS_TabSwitch | 185 #define MAYBE_TabSwitch FAILS_TabSwitch |
186 #else | 186 #else |
187 #define MAYBE_TabSwitch TabSwitch | 187 #define MAYBE_TabSwitch TabSwitch |
188 #endif | 188 #endif |
189 | 189 |
190 TEST_F(TabSwitchingUITest, MAYBE_TabSwitch) { | 190 TEST_F(TabSwitchingUITest, MAYBE_TabSwitch) { |
191 RunTabSwitchingUITest("t", true); | 191 RunTabSwitchingUITest("t", true); |
192 } | 192 } |
193 | 193 |
194 TEST_F(TabSwitchingUITest, TabSwitchRef) { | 194 TEST_F(TabSwitchingUITest, TabSwitchRef) { |
195 UseReferenceBuild(); | 195 UseReferenceBuild(); |
196 RunTabSwitchingUITest("t_ref", true); | 196 RunTabSwitchingUITest("t_ref", true); |
197 } | 197 } |
198 | 198 |
199 } // namespace | 199 } // namespace |
OLD | NEW |