Moved GetCurrentUserName to service_utils.*

TBR=gene
NOTRY=True


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

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

4 files changed, 39 insertions, 13 deletions

diff --git a/cloud_print/service/service.gyp b/cloud_print/service/service.gyp
index 4825b80..9dc7975 100644
--- a/cloud_print/service/service.gyp
+++ b/cloud_print/service/service.gyp
@@ -57,6 +57,8 @@
         'win/local_security_policy.h',
         'win/service_controller.cc',
         'win/service_controller.h',
+        'win/service_utils.cc',
+        'win/service_utils.h',
       ],
     },
     {
diff --git a/cloud_print/service/win/cloud_print_service.cc b/cloud_print/service/win/cloud_print_service.cc
index 187a6ed..c1299c8 100644
--- a/cloud_print/service/win/cloud_print_service.cc
+++ b/cloud_print/service/win/cloud_print_service.cc
@@ -21,6 +21,7 @@
 #include "cloud_print/service/service_switches.h"
 #include "cloud_print/service/win/chrome_launcher.h"
 #include "cloud_print/service/win/service_controller.h"
+#include "cloud_print/service/win/service_utils.h"
 #include "printing/backend/print_backend.h"
 
 namespace {
@@ -110,19 +111,6 @@ bool AskUser(const std::string& request) {
   }
 }
 
-string16 GetCurrentUserName() {
-  ULONG size = 0;
-  string16 result;
-  ::GetUserNameEx(::NameSamCompatible, NULL, &size);
-  result.resize(size);
-  if (result.empty())
-    return result;
-  if (!::GetUserNameEx(::NameSamCompatible, &result[0], &size))
-    result.clear();
-  result.resize(size);
-  return result;
-}
-
 }  // namespace
 
 class CloudPrintServiceModule
diff --git a/cloud_print/service/win/service_utils.cc b/cloud_print/service/win/service_utils.cc
new file mode 100644
index 0000000..acd8c3f
--- /dev/null
+++ b/cloud_print/service/win/service_utils.cc
@@ -0,0 +1,23 @@
+// Copyright (c) 2012 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.
+
+#include "cloud_print/service/win/service_utils.h"
+
+#include <windows.h>
+#include <security.h>  // NOLINT
+
+string16 GetCurrentUserName() {
+  ULONG size = 0;
+  string16 result;
+  ::GetUserNameEx(::NameSamCompatible, NULL, &size);
+  result.resize(size);
+  if (result.empty())
+    return result;
+  if (!::GetUserNameEx(::NameSamCompatible, &result[0], &size))
+    result.clear();
+  result.resize(size);
+  return result;
+}
+
+
diff --git a/cloud_print/service/win/service_utils.h b/cloud_print/service/win/service_utils.h
new file mode 100644
index 0000000..c3cbfa2
--- /dev/null
+++ b/cloud_print/service/win/service_utils.h
@@ -0,0 +1,13 @@
+// Copyright (c) 2012 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.
+
+#ifndef CLOUD_PRINT_SERVICE_SERVICE_UTILS_H_
+#define CLOUD_PRINT_SERVICE_SERVICE_UTILS_H_
+
+#include "base/string16.h"
+
+string16 GetCurrentUserName();
+
+#endif  // CLOUD_PRINT_SERVICE_SERVICE_UTILS_H_
+