Temporary revert "Single binary for unittests."

This reverts commit e1a31ac75aa84f07134de78fc0cec6a49added50.

BUG=none
TEST=none
TBR=vitalybuka

Review URL: https://chromiumcodereview.appspot.com/10543020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140731 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 31 insertions, 16 deletions

diff --git a/cloud_print/service/DEPS b/cloud_print/service/win/DEPS
index 8fa9d48..8fa9d48 100644
--- a/cloud_print/service/DEPS
+++ b/cloud_print/service/win/DEPS
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 5921fd0..8b984f0 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -12,7 +12,7 @@
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
-#include "cloud_print/service/service_switches.h"
+#include "cloud_print/service/win/service_switches.h"
 
 namespace {
 
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index f87c2888..c0948c4 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -15,10 +15,10 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/win/scoped_handle.h"
-#include "cloud_print/service/service_state.h"
-#include "cloud_print/service/service_switches.h"
 #include "cloud_print/service/win/chrome_launcher.h"
 #include "cloud_print/service/win/resource.h"
+#include "cloud_print/service/win/service_state.h"
+#include "cloud_print/service/win/service_switches.h"
 
 namespace {
 
diff --git a/cloud_print/service/service.gyp b/cloud_print/service/win/service.gyp
index 096e0d8..b365e83 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/win/service.gyp
@@ -7,7 +7,7 @@
       'chromium_code': 1,
     },
     'include_dirs': [
-      '<(DEPTH)',
+      '../../..',
     ],
   },
   'targets': [
@@ -15,27 +15,27 @@
       'target_name': 'cloud_print_service_lib',
       'type': 'static_library',
       'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/net/net.gyp:net',
+        '../../../base/base.gyp:base', 
+        '../../../build/temp_gyp/googleurl.gyp:googleurl',
+        '../../../net/net.gyp:net',
       ],
       'sources': [
+        'chrome_launcher.cc',
+        'chrome_launcher.h',
         'service_state.cc',
         'service_state.h',
         'service_switches.cc',
         'service_switches.h',
-        'win/chrome_launcher.cc',
-        'win/chrome_launcher.h',
       ]
     },
     {
       'target_name': 'cloud_print_service',
       'type': 'executable',
       'sources': [
-        'win/cloud_print_service.cc',
-        'win/cloud_print_service.h',
-        'win/cloud_print_service.rc',
-        'win/resource.h',
+        'cloud_print_service.cc',
+        'cloud_print_service.h',
+        'cloud_print_service.rc',
+        'resource.h',
       ],
       'dependencies': [
         'cloud_print_service_lib',
@@ -47,5 +47,20 @@
         },
       },
     },
+    {
+      'target_name': 'cloud_print_service_unittests',
+      'type': 'executable',
+      'sources': [
+        'service_state_unittest.cc',
+      ],
+      'dependencies': [
+        '../../../base/base.gyp:run_all_unittests',
+        '../../../base/base.gyp:base',
+        '../../../base/base.gyp:test_support_base',
+        '../../../testing/gmock.gyp:gmock',
+        '../../../testing/gtest.gyp:gtest',
+        'cloud_print_service_lib',
+      ],
+    },
   ],
 }
diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/win/service_state.cc
index 545210d..8641000 100644
--- a/cloud_print/service/service_state.cc
+++ b/cloud_print/service/win/service_state.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cloud_print/service/service_state.h"
+#include "cloud_print/service/win/service_state.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
diff --git a/cloud_print/service/service_state.h b/cloud_print/service/win/service_state.h
index ef037bb..ef037bb 100644
--- a/cloud_print/service/service_state.h
+++ b/cloud_print/service/win/service_state.h
diff --git a/cloud_print/service/service_state_unittest.cc b/cloud_print/service/win/service_state_unittest.cc
index 4e5d2d0..00c651e 100644
--- a/cloud_print/service/service_state_unittest.cc
+++ b/cloud_print/service/win/service_state_unittest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cloud_print/service/service_state.h"
+#include "cloud_print/service/win/service_state.h"
 
 #include "base/string_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/cloud_print/service/service_switches.cc b/cloud_print/service/win/service_switches.cc
index a03c89c..296eae0 100644
--- a/cloud_print/service/service_switches.cc
+++ b/cloud_print/service/win/service_switches.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "cloud_print/service/service_switches.h"
+#include "cloud_print/service/win/service_switches.h"
 
 const char kChromeTypeSwitch[] = "type";
 const char kConsoleSwitch[] = "console";
diff --git a/cloud_print/service/service_switches.h b/cloud_print/service/win/service_switches.h
index 17af981..17af981 100644
--- a/cloud_print/service/service_switches.h
+++ b/cloud_print/service/win/service_switches.h