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

Side by Side Diff: ui/base/test/run_all_unittests.cc

Issue 672673005: Remove IsHighDPIEnabled, move EnableHighDPISupport to only place it's used (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dpi-cleanup-5
Patch Set: rebase-6 Created 6 years, 1 month 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
« no previous file with comments | « ui/base/resource/resource_bundle_win.cc ('k') | ui/gfx/screen_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/bind.h" 5 #include "base/bind.h"
6 #include "base/files/file_path.h" 6 #include "base/files/file_path.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/test/launcher/unit_test_launcher.h" 8 #include "base/test/launcher/unit_test_launcher.h"
9 #include "base/test/test_suite.h" 9 #include "base/test/test_suite.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
(...skipping 30 matching lines...) Expand all
41 DISALLOW_COPY_AND_ASSIGN(UIBaseTestSuite); 41 DISALLOW_COPY_AND_ASSIGN(UIBaseTestSuite);
42 }; 42 };
43 43
44 UIBaseTestSuite::UIBaseTestSuite(int argc, char** argv) 44 UIBaseTestSuite::UIBaseTestSuite(int argc, char** argv)
45 : base::TestSuite(argc, argv) {} 45 : base::TestSuite(argc, argv) {}
46 46
47 void UIBaseTestSuite::Initialize() { 47 void UIBaseTestSuite::Initialize() {
48 base::TestSuite::Initialize(); 48 base::TestSuite::Initialize();
49 49
50 #if defined(OS_WIN) 50 #if defined(OS_WIN)
51 gfx::ForceHighDPISupportForTesting(1.0); 51 gfx::InitDeviceScaleFactor(1.0);
52 #endif 52 #endif
53 53
54 #if defined(OS_ANDROID) 54 #if defined(OS_ANDROID)
55 // Register JNI bindings for android. 55 // Register JNI bindings for android.
56 gfx::android::RegisterJni(base::android::AttachCurrentThread()); 56 gfx::android::RegisterJni(base::android::AttachCurrentThread());
57 ui::android::RegisterJni(base::android::AttachCurrentThread()); 57 ui::android::RegisterJni(base::android::AttachCurrentThread());
58 #endif 58 #endif
59 59
60 ui::RegisterPathProvider(); 60 ui::RegisterPathProvider();
61 61
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 } // namespace 103 } // namespace
104 104
105 int main(int argc, char** argv) { 105 int main(int argc, char** argv) {
106 UIBaseTestSuite test_suite(argc, argv); 106 UIBaseTestSuite test_suite(argc, argv);
107 107
108 return base::LaunchUnitTests(argc, 108 return base::LaunchUnitTests(argc,
109 argv, 109 argv,
110 base::Bind(&UIBaseTestSuite::Run, 110 base::Bind(&UIBaseTestSuite::Run,
111 base::Unretained(&test_suite))); 111 base::Unretained(&test_suite)));
112 } 112 }
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_win.cc ('k') | ui/gfx/screen_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698