Make the dependency of enable_print_preview and enable_pdf explicit

chrome/utility/BUILD.gn

 # 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.
 
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/sysroot.gni")
 
 gypi_values = exec_script("//build/gypi_to_gn.py",
                           [ rebase_path("../chrome_utility.gypi") ],
@@ skipping 82 matching lines @@
     sources += [
       "importer/nss_decryptor_system_nss.cc",
       "importer/nss_decryptor_system_nss.h",
     ]
     deps += [
       "//crypto",
       "//crypto:platform",
     ]
   }
 
-  if (!enable_print_preview) {
+  if (!enable_print_preview && !is_win) {

[Lei Zhang, 2016/05/18 21:43:37]

Also, "enable_print_preview" used to imply "enable_basic_printing" but later we
changed it so that the two variables are independent of each other. Given that,
this should actually be:

(enable_print_preview || (enable_basic_printing & is_win))

Can we make that change while we are here?
chrome/utility/chrome_content_utility_client.cc and
chrome/utility/printing_handler.h have ifdefs that should be updated as well.

[Lei Zhang, 2016/05/18 21:43:37]

Would you mind negating this?

if (enable_print_preview || is_win) {
  deps += [ "//pdf" ]
} else {
  sources -= [
    "printing_handler.cc",
    "printing_handler.h",
  ]
}

[Wei Li, 2016/05/19 17:13:30]

Thanks for the explanation. Done. 

[Wei Li, 2016/05/19 17:13:30]

Done.

[Wei Li, 2016/05/19 17:13:30]

Thanks for the explanation. Done. 

     sources -= [
       "printing_handler.cc",
       "printing_handler.h",
     ]
+  } else {
+    deps += [ "//pdf" ]
   }
 
   if (safe_browsing_mode == 1) {
     sources +=
         rebase_path(gypi_values.chrome_utility_safe_browsing_sources, ".", "..")
     deps += [ "//third_party/zlib" ]
   }
-
-  if (enable_pdf) {
-    deps += [ "//pdf" ]
-  }
 }
 
 if (is_mac) {
   import("//testing/libfuzzer/fuzzer_test.gni")
   fuzzer_test("safe_browsing_dmg_fuzzer") {
     sources = [
       "safe_browsing/mac/fuzzer.cc",
       "safe_browsing/mac/hfs.cc",
       "safe_browsing/mac/hfs.h",
       "safe_browsing/mac/read_stream.cc",
       "safe_browsing/mac/read_stream.h",
       "safe_browsing/mac/udif.cc",
       "safe_browsing/mac/udif.h",
     ]
 
     additional_configs = [ ":utility_ldflags" ]
 
     deps = [
       "//base",
       "//third_party/zlib",
     ]
   }
 }