Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(418)

Side by Side Diff: chrome/common/service_process_util_unittest.cc

Issue 8665006: Build & run unit tests on Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 13 matching lines...) Expand all
24 24
25 #if defined(OS_WIN) 25 #if defined(OS_WIN)
26 #include "base/win/win_util.h" 26 #include "base/win/win_util.h"
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(TOUCH_UI) 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 FAILS_ForceShutdown
38 #else 38 #else
39 #if defined(OS_LINUX) 39 #if defined(OS_LINUX)
40 #define MAYBE_ForceShutdown FLAKY_ForceShutdown 40 #define MAYBE_ForceShutdown FLAKY_ForceShutdown
41 #else 41 #else
42 #define MAYBE_ForceShutdown ForceShutdown 42 #define MAYBE_ForceShutdown ForceShutdown
43 #endif 43 #endif
44 #endif 44 #endif
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
575 ScopedAttributesRestorer restorer(bundle_path(), 0777); 575 ScopedAttributesRestorer restorer(bundle_path(), 0777);
576 GetIOMessageLoopProxy()->PostTask( 576 GetIOMessageLoopProxy()->PostTask(
577 FROM_HERE, 577 FROM_HERE,
578 base::Bind(&ChangeAttr, bundle_path(), 0222)); 578 base::Bind(&ChangeAttr, bundle_path(), 0222));
579 Run(); 579 Run();
580 ASSERT_TRUE(mock_launchd()->remove_called()); 580 ASSERT_TRUE(mock_launchd()->remove_called());
581 ASSERT_TRUE(mock_launchd()->delete_called()); 581 ASSERT_TRUE(mock_launchd()->delete_called());
582 } 582 }
583 583
584 #endif // !OS_MACOSX 584 #endif // !OS_MACOSX
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698