remove dep on unotest from osl_Pipe test

Change-Id: I5f5862a684e52bd3d1336fa9f8cffa77cdebbe4c

3 files changed, 2 insertions, 43 deletions

diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index 315447cd6dd0..558b8a745361 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Library_add_exception_objects,unotest,\
     unotest/source/cpp/macros_test \
     unotest/source/cpp/officeconnection \
     unotest/source/cpp/toabsolutefileurl \
-    unotest/source/cpp/uniquepipename \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/unotest/source/cpp/officeconnection.cxx b/unotest/source/cpp/officeconnection.cxx
index 326b3325868e..51cc6df8de3d 100644
--- a/unotest/source/cpp/officeconnection.cxx
+++ b/unotest/source/cpp/officeconnection.cxx
@@ -27,12 +27,12 @@
 #include "cppuhelper/bootstrap.hxx"
 #include "cppunit/TestAssert.h"
 #include "osl/process.h"
+#include "osl/test/uniquepipename.hxx"
 #include "osl/time.h"
 #include "sal/macros.h"
 #include "sal/types.h"
 #include "unotest/officeconnection.hxx"
 #include "unotest/toabsolutefileurl.hxx"
-#include "unotest/uniquepipename.hxx"
 
 #include "getargument.hxx"
 
@@ -53,7 +53,7 @@ void OfficeConnection::setUp() {
             "soffice",
             &argSoffice));
     if (argSoffice.match("path:")) {
-        desc = "pipe,name=" + uniquePipeName("oootest");
+        desc = "pipe,name=" + osl::test::uniquePipeName("oootest");
         OUString noquickArg("--quickstart=no");
         OUString norestoreArg("--norestore");
         OUString nologoArg("--nologo");
diff --git a/unotest/source/cpp/uniquepipename.cxx b/unotest/source/cpp/uniquepipename.cxx
deleted file mode 100644
index ed6edcb2a46b..000000000000
--- a/unotest/source/cpp/uniquepipename.cxx
+++ /dev/null
@@ -1,40 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "sal/types.h"
-#include "cppunit/TestAssert.h"
-#include "osl/process.h"
-#include "rtl/ustring.h"
-#include "rtl/ustring.hxx"
-#include "unotest/uniquepipename.hxx"
-
-namespace test {
-
-OUString uniquePipeName(OUString const & name) {
-    oslProcessInfo info;
-    info.Size = sizeof info;
-    CPPUNIT_ASSERT_EQUAL(
-        osl_Process_E_None,
-        osl_getProcessInfo(nullptr, osl_Process_IDENTIFIER, &info));
-    return name + OUString::number(info.Ident);
-}
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */