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

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: rebase 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 // Smooth scrolling confuses the scrollbar test.
61 launch_arguments_.AppendSwitch(switches::kDisableSmoothScrolling);
58 } 62 }
59 63
60 void RunTest(const std::string& test_case) { 64 void RunTest(const std::string& test_case) {
61 FilePath test_path; 65 FilePath test_path;
62 PathService::Get(base::DIR_SOURCE_ROOT, &test_path); 66 PathService::Get(base::DIR_SOURCE_ROOT, &test_path);
63 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi")); 67 test_path = test_path.Append(FILE_PATH_LITERAL("ppapi"));
64 test_path = test_path.Append(FILE_PATH_LITERAL("tests")); 68 test_path = test_path.Append(FILE_PATH_LITERAL("tests"));
65 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html")); 69 test_path = test_path.Append(FILE_PATH_LITERAL("test_case.html"));
66 70
67 // Sanity check the file name. 71 // Sanity check the file name.
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) { 284 TEST_F(OutOfProcessPPAPITest, FAILS_Transport) {
281 RunTestViaHTTP("Transport"); 285 RunTestViaHTTP("Transport");
282 } 286 }
283 #endif // ENABLE_P2P_APIS 287 #endif // ENABLE_P2P_APIS
284 288
285 TEST_PPAPI_IN_PROCESS(UMA) 289 TEST_PPAPI_IN_PROCESS(UMA)
286 // There is no proxy. 290 // There is no proxy.
287 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) { 291 TEST_F(OutOfProcessPPAPITest, FAILS_UMA) {
288 RunTest("UMA"); 292 RunTest("UMA");
289 } 293 }
OLDNEW
« no previous file with comments | « chrome/browser/tab_contents/render_view_host_delegate_helper.cc ('k') | content/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698