ui: Move win gfx tests into gfx_unittests target.

This is pretty straightforward, just moving the remaining win tests from
ui_unittests.gyp to gfx_tests.gyp. gfx_unittests now has a
TestSuite that setups everything we need to run it.

BUG=331829
TEST=ui_unittests, gfx_unittests
TBR=ben@chromium.org,danakj@chromium.org

Review URL: https://codereview.chromium.org/469003009

Cr-Commit-Position: refs/heads/master@{#290173}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290173 0039d316-1c4b-4281-b951-d872f2087c98

ui/base/test/run_all_unittests.cc

@@ -10,7 +10,6 @@
 #include "build/build_config.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/gfx/gfx_paths.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/jni_android.h"
@@ -58,7 +57,6 @@ void UIBaseTestSuite::Initialize() {
 #endif
 
   ui::RegisterPathProvider();
-  gfx::RegisterPathProvider();
 
   base::FilePath exe_path;
   PathService::Get(base::DIR_EXE, &exe_path);

ui/gfx/gfx_tests.gyp

@@ -146,6 +146,35 @@
             'screen_unittest.cc',
           ],
         }],
+        ['OS == "win"', {
+          'sources': [
+            'color_profile_win_unittest.cc',
+            'font_fallback_win_unittest.cc',
+            'icon_util_unittest.cc',
+            'icon_util_unittests.rc',
+            'platform_font_win_unittest.cc',
+          ],
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'DelayLoadDLLs': [
+                'd2d1.dll',
+                'd3d10_1.dll',
+              ],
+              'AdditionalDependencies': [
+                'd2d1.lib',
+                'd3d10_1.lib',
+              ],
+            },
+          },
+          'link_settings': {
+            'libraries': [
+              '-limm32.lib',
+              '-loleacc.lib',
+            ],
+          },
+          # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+          'msvs_disabled_warnings': [ 4267, ],
+        }],
       ],
     }
   ],

ui/gfx/icon_util_unittest.cc

@@ -27,7 +27,8 @@ static const char kTempIconFilename[] = "temp_test_icon.ico";
 class IconUtilTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
-    PathService::Get(gfx::DIR_TEST_DATA, &test_data_directory_);
+    gfx::RegisterPathProvider();
+    ASSERT_TRUE(PathService::Get(gfx::DIR_TEST_DATA, &test_data_directory_));
     temp_directory_.CreateUniqueTempDir();
   }
 

ui/ui_unittests.gyp

@@ -110,15 +110,6 @@
             'base/dragdrop/os_exchange_data_win_unittest.cc',
             'base/win/hwnd_subclass_unittest.cc',
             'base/win/open_file_name_win_unittest.cc',
-            'gfx/color_profile_win_unittest.cc',
-            'gfx/font_fallback_win_unittest.cc',
-            'gfx/icon_util_unittest.cc',
-            'gfx/icon_util_unittests.rc',
-            'gfx/platform_font_win_unittest.cc',
-          ],
-          'include_dirs': [
-            '../..',
-            '../third_party/wtl/include',
           ],
           'msvs_settings': {
             'VCLinkerTool': {