Enable hidpi on Linux, refactor a bit on Windows to share

content/test/content_test_suite.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/content_test_suite.h"
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "gpu/config/gpu_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
-
-#if defined(OS_WIN)
-#include "ui/gfx/win/dpi.h"
-#endif
+#include "ui/gfx/dpi.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #if !defined(OS_IOS)
 #include "base/test/mock_chrome_application_mac.h"
 #endif
 #endif
 
 #if !defined(OS_IOS)
 #include "base/base_switches.h"
@@ skipping 36 matching lines @@
 }
 
 void ContentTestSuite::Initialize() {
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 #if !defined(OS_IOS)
   mock_cr_app::RegisterMockCrApp();
 #endif
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   gfx::InitDeviceScaleFactor(1.0f);
 #endif
 
   ContentTestSuiteBase::Initialize();
   {
     ContentClient client;
     ContentTestSuiteBase::RegisterContentSchemes(&client);
   }
   RegisterPathProvider();
 #if !defined(OS_IOS)
   media::InitializeMediaLibraryForTesting();
   // When running in a child process for Mac sandbox tests, the sandbox exists
   // to initialize GL, so don't do it here.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kTestChildProcess)) {
     gfx::GLSurface::InitializeOneOffForTests();
     gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess());
   }
 #endif
   testing::TestEventListeners& listeners =
       testing::UnitTest::GetInstance()->listeners();
   listeners.Append(new TestInitializationListener);
 }
 
 }  // namespace content