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

content/test/blink_test_environment.cc

 // Copyright 2014 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/blink_test_environment.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "content/test/test_blink_web_unit_test_support.h"
 #include "third_party/WebKit/public/web/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
+#include "ui/gfx/dpi.h"
 #include "url/url_util.h"
 
-#if defined(OS_WIN)
-#include "ui/gfx/win/dpi.h"
-#endif
-
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
 #include "net/android/network_library.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/test/mock_chrome_application_mac.h"
 #endif
 
 namespace content {
@@ skipping 56 matching lines @@
 
 #if defined(OS_ANDROID)
   JNIEnv* env = base::android::AttachCurrentThread();
   net::android::RegisterNetworkLibrary(env);
 #endif
 
 #if defined(OS_MACOSX)
   mock_cr_app::RegisterMockCrApp();
 #endif
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   gfx::InitDeviceScaleFactor(1.0f);
 #endif
 
   // Explicitly initialize the GURL library before spawning any threads.
   // Otherwise crash may happend when different threads try to create a GURL
   // at same time.
   url::Initialize();
   test_environment = new TestEnvironment;
 }
 
 void TearDownBlinkTestEnvironment() {
   // Flush any remaining messages before we kill ourselves.
   // http://code.google.com/p/chromium/issues/detail?id=9500
   base::RunLoop().RunUntilIdle();
 
   if (RunningOnValgrind())
     blink::WebCache::clear();
   delete test_environment;
   test_environment = NULL;
 }
 
 }  // namespace content