Revert of Stub out Skia AVX and HSW opts.

skia/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//printing/features/features.gni")
 import("//testing/test.gni")
 import("//third_party/skia/gn/shared_sources.gni")
 
@@ skipping 529 matching lines @@
         defines = [ "SK_CPU_SSE_LEVEL=42" ]
       }
       visibility = [ ":skia_opts" ]
       configs -= [ "//build/config/compiler:chromium_code" ]
       configs += [
         ":skia_config",
         ":skia_library_config",
         "//build/config/compiler:no_chromium_code",
       ]
     }
-
-    # skia_opts_avx and skia_opts_hsw are stubbed out for crbug.com/666707.
     source_set("skia_opts_avx") {
-      #sources = skia_opts.avx_sources
-      sources = [
-        "ext/SkOpts_avx_stub.cc",
-      ]
+      sources = skia_opts.avx_sources
       if (!is_win) {
         cflags = [ "-mavx" ]
       }
       if (is_win) {
         cflags = [ "/arch:AVX" ]
       }
       visibility = [ ":skia_opts" ]
       configs -= [ "//build/config/compiler:chromium_code" ]
       configs += [
         ":skia_config",
         ":skia_library_config",
         "//build/config/compiler:no_chromium_code",
       ]
     }
     source_set("skia_opts_hsw") {
-      #sources = skia_opts.hsw_sources
-      sources = [
-        "ext/SkOpts_hsw_stub.cc",
-      ]
+      sources = skia_opts.hsw_sources
       if (!is_win) {
         cflags = [
           "-mavx2",
           "-mbmi",
           "-mbmi2",
           "-mf16c",
           "-mfma",
         ]
       }
       if (is_win) {
@@ skipping 147 matching lines @@
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
       "//build/config/sanitizers:deps",
       "//build/win:default_exe_manifest",
     ]
   }
 }