Build & run unit tests on Aura (Rebase)

chrome/common/service_process_util_unittest.cc

 // Copyright (c) 2011 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 "chrome/common/service_process_util.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 13 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "chrome/common/auto_start_linux.h"
 #include <glib.h>
 #endif
 
-#if defined(TOUCH_UI)
+#if defined(USE_AURA)
 // This test fails http://crbug.com/84854, and is very flaky on CrOS and
 // somewhat flaky on other Linux.
 #define MAYBE_ForceShutdown FAILS_ForceShutdown
 #else
 #if defined(OS_LINUX)
 #define MAYBE_ForceShutdown FLAKY_ForceShutdown
 #else
 #define MAYBE_ForceShutdown ForceShutdown
 #endif
 #endif
@@ skipping 530 matching lines @@
   ScopedAttributesRestorer restorer(bundle_path(), 0777);
   GetIOMessageLoopProxy()->PostTask(
       FROM_HERE,
       base::Bind(&ChangeAttr, bundle_path(), 0222));
   Run();
   ASSERT_TRUE(mock_launchd()->remove_called());
   ASSERT_TRUE(mock_launchd()->delete_called());
 }
 
 #endif  // !OS_MACOSX