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

Side by Side Diff: chrome/browser/locale_tests_browsertest.cc

Issue 26622003: linux_aura: Turn it on again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase to ToT and test against the recently committed nacl patch. Created 7 years, 1 month 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
OLDNEW
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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/environment.h" 6 #include "base/environment.h"
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/test/base/in_process_browser_test.h" 8 #include "chrome/test/base/in_process_browser_test.h"
9 #include "ui/base/ui_base_switches.h" 9 #include "ui/base/ui_base_switches.h"
10 10
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 }; 92 };
93 93
94 class LocaleTestTraditionalChinese : public LocaleTestBase { 94 class LocaleTestTraditionalChinese : public LocaleTestBase {
95 public: 95 public:
96 LocaleTestTraditionalChinese() : LocaleTestBase("zh-TW") { 96 LocaleTestTraditionalChinese() : LocaleTestBase("zh-TW") {
97 } 97 }
98 }; 98 };
99 99
100 } // namespace 100 } // namespace
101 101
102 // TODO(erg): http://crbug.com/316716, as part of the bringup.
103 //
104 // This is likely a bot configuration issue; the resolution is probably to get
105 // packages installed everywhere.
106 #if defined(OS_LINUX) && defined(USE_AURA) && !defined(OS_CHROMEOS)
107 #define MAYBE_TestStart DISABLED_TestStart
108 #else
109 #define MAYBE_TestStart TestStart
110 #endif
111
102 // Start Chrome and shut it down on the Danish locale, the Hebrew locale, and 112 // Start Chrome and shut it down on the Danish locale, the Hebrew locale, and
103 // the Traditional-Chinese locale, respectively. These tests do not need any 113 // the Traditional-Chinese locale, respectively. These tests do not need any
104 // code here because they just verify we can start Chrome and shut it down 114 // code here because they just verify we can start Chrome and shut it down
105 // cleanly on these locales. 115 // cleanly on these locales.
106 IN_PROC_BROWSER_TEST_F(LocaleTestDanish, TestStart) { 116 IN_PROC_BROWSER_TEST_F(LocaleTestDanish, MAYBE_TestStart) {
107 } 117 }
108 118
109 IN_PROC_BROWSER_TEST_F(LocaleTestHebrew, TestStart) { 119 IN_PROC_BROWSER_TEST_F(LocaleTestHebrew, MAYBE_TestStart) {
110 } 120 }
111 121
112 IN_PROC_BROWSER_TEST_F(LocaleTestTraditionalChinese, TestStart) { 122 IN_PROC_BROWSER_TEST_F(LocaleTestTraditionalChinese, MAYBE_TestStart) {
113 } 123 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/subscribe_page_action_browsertest.cc ('k') | chrome/browser/prerender/prerender_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698