User constansts from chrome_switches.h

NOTRY=True

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

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

6 files changed, 14 insertions, 12 deletions

diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 8e11395..a5ed819 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -32,6 +32,7 @@
     {
       'target_name': 'cloud_print_service_lib',
       'type': 'static_library',
+      'defines': ['COMPILE_CONTENT_STATICALLY'],
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
@@ -44,10 +45,12 @@
           'dependencies': [
             '<(DEPTH)/chrome/chrome.gyp:chrome_version_header',
             '<(DEPTH)/chrome/chrome.gyp:launcher_support',
+            '<(DEPTH)/chrome/common_constants.gyp:common_constants',
           ],
         }],
       ],
       'sources': [
+        '<(DEPTH)/content/public/common/content_switches.cc',
         'service_state.cc',
         'service_state.h',
         'service_switches.cc',
diff --git a/cloud_print/service/service_switches.cc b/cloud_print/service/service_switches.cc
index 8896349..9386777 100644
--- a/cloud_print/service/service_switches.cc
+++ b/cloud_print/service/service_switches.cc
@@ -4,7 +4,6 @@
 
 #include "cloud_print/service/service_switches.h"
 
-const char kChromeTypeSwitch[] = "type";
 const char kConsoleSwitch[] = "console";
 const char kInstallSwitch[] = "install";
 const char kRequirementsSwitch[] = "requirements";
@@ -12,5 +11,4 @@ const char kServiceSwitch[] = "service";
 const char kStartSwitch[] = "start";
 const char kStopSwitch[] = "stop";
 const char kUninstallSwitch[] = "uninstall";
-const char kUserDataDirSwitch[] = "user-data-dir";
 
diff --git a/cloud_print/service/service_switches.h b/cloud_print/service/service_switches.h
index a6704f7..ae92fed 100644
--- a/cloud_print/service/service_switches.h
+++ b/cloud_print/service/service_switches.h
@@ -5,7 +5,6 @@
 #ifndef CLOUD_PRINT_SERVICE_SERVICE_SWITCHES_H_
 #define CLOUD_PRINT_SERVICE_SERVICE_SWITCHES_H_
 
-extern const char kChromeTypeSwitch[];
 extern const char kConsoleSwitch[];
 extern const char kInstallSwitch[];
 extern const char kRequirementsSwitch[];
@@ -13,7 +12,6 @@ extern const char kServiceSwitch[];
 extern const char kStartSwitch[];
 extern const char kStopSwitch[];
 extern const char kUninstallSwitch[];
-extern const char kUserDataDirSwitch[];
 
 #endif  // CLOUD_PRINT_SERVICE_SERVICE_SWITCHES_H_
 
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 2fafe6f..98ed5a4 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -9,6 +9,7 @@
 #include "base/process_util.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "cloud_print/service/service_switches.h"
 
@@ -82,8 +83,8 @@ void ChromeLauncher::Run() {
 
     if (!chrome_path.empty()) {
       CommandLine cmd(chrome_path);
-      cmd.AppendSwitchASCII(kChromeTypeSwitch, "service");
-      cmd.AppendSwitchPath(kUserDataDirSwitch, user_data_);
+      cmd.AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess);
+      cmd.AppendSwitchPath(switches::kUserDataDir, user_data_);
       base::win::ScopedHandle chrome_handle;
       base::Time started = base::Time::Now();
       DWORD thread_id = 0;
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index 0bc922e..7c6b289 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -17,6 +17,7 @@
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
+#include "chrome/common/chrome_switches.h"
 #include "cloud_print/service/service_state.h"
 #include "cloud_print/service/service_switches.h"
 #include "cloud_print/service/win/chrome_launcher.h"
@@ -39,7 +40,7 @@ void InvalidUsage() {
     std::cout << "[";
       std::cout << "[";
         std::cout << " -" << kInstallSwitch;
-        std::cout << " -" << kUserDataDirSwitch << "=DIRECTORY";
+        std::cout << " -" << switches::kUserDataDir << "=DIRECTORY";
       std::cout << "]";
     std::cout << "]";
     std::cout << " | -" << kUninstallSwitch;
@@ -53,7 +54,8 @@ void InvalidUsage() {
     const char* description;
   } kSwitchHelp[] = {
     { kInstallSwitch, "Installs cloud print as service." },
-    { kUserDataDirSwitch, "User data directory with \"Service State\" file." },
+    { switches::kUserDataDir,
+      "User data directory with \"Service State\" file." },
     { kUninstallSwitch, "Uninstalls service." },
     { kStartSwitch, "Starts service. May be combined with installation." },
     { kStopSwitch, "Stops service." },
@@ -177,7 +179,7 @@ class CloudPrintServiceModule
       return E_INVALIDARG;
     *is_service = false;
 
-    user_data_dir_ = command_line.GetSwitchValuePath(kUserDataDirSwitch);
+    user_data_dir_ = command_line.GetSwitchValuePath(switches::kUserDataDir);
     if (command_line.HasSwitch(kStopSwitch))
       return controller_->StopService();
 
@@ -185,7 +187,7 @@ class CloudPrintServiceModule
       return controller_->UninstallService();
 
     if (command_line.HasSwitch(kInstallSwitch)) {
-      if (!command_line.HasSwitch(kUserDataDirSwitch)) {
+      if (!command_line.HasSwitch(switches::kUserDataDir)) {
         InvalidUsage();
         return S_FALSE;
       }
diff --git a/cloud_print/service/win/service_controller.cc b/cloud_print/service/win/service_controller.cc
index 792c757..2c441cb 100644
--- a/cloud_print/service/win/service_controller.cc
+++ b/cloud_print/service/win/service_controller.cc
@@ -12,7 +12,7 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/win/scoped_handle.h"
-#include "cloud_print/service/service_switches.h"
+#include "chrome/common/chrome_switches.h"
 #include "cloud_print/service/win/local_security_policy.h"
 
 namespace {
@@ -130,7 +130,7 @@ HRESULT ServiceController::InstallService(const string16& user,
   CHECK(PathService::Get(base::FILE_EXE, &service_path));
   CommandLine command_line(service_path);
   command_line.AppendSwitch(run_switch);
-  command_line.AppendSwitchPath(kUserDataDirSwitch, user_data_dir);
+  command_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
 
   LocalSecurityPolicy local_security_policy;
   if (local_security_policy.Open()) {