From 900f63e7d8ec7356108c4e002db8c642314c5455 Mon Sep 17 00:00:00 2001
From: pastarmovj <pastarmovj@chromium.org>
Date: Fri, 10 Mar 2017 07:03:16 -0800
Subject: [PATCH] Remove special output_dir from cloud_print's BUILD files.

BUG=697092

Review-Url: https://codereview.chromium.org/2741633003
Cr-Commit-Position: refs/heads/master@{#456061}
---
 cloud_print/DEPS                                | 1 -
 cloud_print/virtual_driver/win/install/BUILD.gn | 2 +-
 cloud_print/virtual_driver/win/install/setup.cc | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/cloud_print/DEPS b/cloud_print/DEPS
index edd33b743e786d..51643dee59999c 100644
--- a/cloud_print/DEPS
+++ b/cloud_print/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
   "+chrome/common",
   "+chrome/installer/launcher_support",
-  "+virtual_driver_setup_resources",
 ]
diff --git a/cloud_print/virtual_driver/win/install/BUILD.gn b/cloud_print/virtual_driver/win/install/BUILD.gn
index 2c8fbaa0bcd821..17b7fd2b6be3d5 100644
--- a/cloud_print/virtual_driver/win/install/BUILD.gn
+++ b/cloud_print/virtual_driver/win/install/BUILD.gn
@@ -62,7 +62,7 @@ grit("resources") {
 
   # TODO(thakis): Consider removing this in favor of the default directory,
   # https://crbug.com/697092
-  output_dir = "$root_gen_dir/virtual_driver_setup_resources"
+  # output_dir = "$root_gen_dir/virtual_driver_setup_resources"
 
   outputs = [
     "grit/virtual_driver_setup_resources.h",
diff --git a/cloud_print/virtual_driver/win/install/setup.cc b/cloud_print/virtual_driver/win/install/setup.cc
index 64eef52f2c9561..70ae0ddd350314 100644
--- a/cloud_print/virtual_driver/win/install/setup.cc
+++ b/cloud_print/virtual_driver/win/install/setup.cc
@@ -21,9 +21,9 @@
 #include "base/win/windows_version.h"
 #include "cloud_print/common/win/cloud_print_utils.h"
 #include "cloud_print/common/win/install_utils.h"
+#include "cloud_print/virtual_driver/win/install/grit/virtual_driver_setup_resources.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_consts.h"
 #include "cloud_print/virtual_driver/win/virtual_driver_helpers.h"
-#include "virtual_driver_setup_resources/grit/virtual_driver_setup_resources.h"
 
 #include <strsafe.h>  // Must be after base headers to avoid deprecation
                       // warnings.