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

Side by Side Diff: chrome/test/ui/ppapi_uitest.cc

Issue 7693019: Enable smooth scrolling on mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 3 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 | Annotate | Revision Log
OLDNEW
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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "content/common/content_switches.h"
9 #include "chrome/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/automation/tab_proxy.h" 11 #include "chrome/test/automation/tab_proxy.h"
11 #include "chrome/test/ui/ui_test.h" 12 #include "chrome/test/ui/ui_test.h"
12 #include "net/base/net_util.h" 13 #include "net/base/net_util.h"
13 #include "net/test/test_server.h" 14 #include "net/test/test_server.h"
14 #include "webkit/plugins/plugin_switches.h" 15 #include "webkit/plugins/plugin_switches.h"
15 16
16 namespace { 17 namespace {
17 18
18 // Platform-specific filename relative to the chrome executable. 19 // Platform-specific filename relative to the chrome executable.
(...skipping 29 matching lines...) Expand all
48 launch_arguments_.AppendSwitch(switches::kEnableFileCookies); 49 launch_arguments_.AppendSwitch(switches::kEnableFileCookies);
49 50
50 // Some stuff is hung off of the testing interface which is not enabled 51 // Some stuff is hung off of the testing interface which is not enabled
51 // by default. 52 // by default.
52 launch_arguments_.AppendSwitch(switches::kEnablePepperTesting); 53 launch_arguments_.AppendSwitch(switches::kEnablePepperTesting);
53 54
54 // Give unlimited quota for files to Pepper tests. 55 // Give unlimited quota for files to Pepper tests.
55 // TODO(dumi): remove this switch once we have a quota management 56 // TODO(dumi): remove this switch once we have a quota management
56 // system in place. 57 // system in place.
57 launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles); 58 launch_arguments_.AppendSwitch(switches::kUnlimitedQuotaForFiles);
59
60 #if defined(OS_MACOSX)
61 // Smooth scrolling confuses the scrollbar test.
62 launch_arguments_.AppendSwitch(
63 switches::kDisableMacSmoothScrollingForTesting);
64 #endif
58 } 65 }
59 66
60 void RunTest(const std::string& test_case) { 67 void RunTest(const std::string& test_case) {
61 FilePath test_path; 68 FilePath test_path;
62 PathService::Get(base::DIR_SOURCE_ROOT, &test_path); 69 PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
63 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi")); 70 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi"));
64 test_path = test_path.Append(FILE_PATH_LITERAL("tests")); 71 test_path = test_path.Append(FILE_PATH_LITERAL("tests"));
65 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html")); 72 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html"));
66 73
67 // Sanity check the file name. 74 // Sanity check the file name.
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { 279 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) {
273 RunTestViaHTTP("Transport"); 280 RunTestViaHTTP("Transport");
274 } 281 }
275 #endif // ENABLE_P2P_APIS 282 #endif // ENABLE_P2P_APIS
276 283
277 TEST_PPAPI_IN_PROCESS(UMA) 284 TEST_PPAPI_IN_PROCESS(UMA)
278 // There is no proxy. 285 // There is no proxy.
279 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { 286 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) {
280 RunTest("UMA"); 287 RunTest("UMA");
281 } 288 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698