OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/common/service_process_util.h" | 5 #include "chrome/common/service_process_util.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 #endif | 27 #endif |
28 | 28 |
29 #if defined(OS_POSIX) | 29 #if defined(OS_POSIX) |
30 #include "chrome/common/auto_start_linux.h" | 30 #include "chrome/common/auto_start_linux.h" |
31 #include <glib.h> | 31 #include <glib.h> |
32 #endif | 32 #endif |
33 | 33 |
34 #if defined(USE_AURA) | 34 #if defined(USE_AURA) |
35 // This test fails http://crbug.com/84854, and is very flaky on CrOS and | 35 // This test fails http://crbug.com/84854, and is very flaky on CrOS and |
36 // somewhat flaky on other Linux. | 36 // somewhat flaky on other Linux. |
37 #define MAYBE_ForceShutdown FAILS_ForceShutdown | 37 #define MAYBE_ForceShutdown DISABLED_ForceShutdown |
38 #else | 38 #else |
39 #if defined(OS_LINUX) || defined(OS_WIN) | 39 #if defined(OS_LINUX) || defined(OS_WIN) |
40 #define MAYBE_ForceShutdown DISABLED_ForceShutdown | 40 #define MAYBE_ForceShutdown DISABLED_ForceShutdown |
41 #else | 41 #else |
42 #define MAYBE_ForceShutdown ForceShutdown | 42 #define MAYBE_ForceShutdown ForceShutdown |
43 #endif | 43 #endif |
44 #endif | 44 #endif |
45 | 45 |
46 namespace { | 46 namespace { |
47 | 47 |
(...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
409 ScopedAttributesRestorer restorer(bundle_path(), 0777); | 409 ScopedAttributesRestorer restorer(bundle_path(), 0777); |
410 GetIOMessageLoopProxy()->PostTask( | 410 GetIOMessageLoopProxy()->PostTask( |
411 FROM_HERE, | 411 FROM_HERE, |
412 base::Bind(&ChangeAttr, bundle_path(), 0222)); | 412 base::Bind(&ChangeAttr, bundle_path(), 0222)); |
413 Run(); | 413 Run(); |
414 ASSERT_TRUE(mock_launchd()->remove_called()); | 414 ASSERT_TRUE(mock_launchd()->remove_called()); |
415 ASSERT_TRUE(mock_launchd()->delete_called()); | 415 ASSERT_TRUE(mock_launchd()->delete_called()); |
416 } | 416 } |
417 | 417 |
418 #endif // !OS_MACOSX | 418 #endif // !OS_MACOSX |
OLD | NEW |