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

Unified Diff: chrome/browser/extensions/api/system_cpu/system_cpu_apitest.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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
diff --git a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
index 1448727e162759e82a0165586616af82106b44fc..c9799bdec9f313933f880bfdb70588c066abbadc 100644
--- a/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
+++ b/chrome/browser/extensions/api/system_cpu/system_cpu_apitest.cc
@@ -34,7 +34,14 @@ class SystemCpuApiTest: public ExtensionApiTest {
}
};
-IN_PROC_BROWSER_TEST_F(SystemCpuApiTest, Cpu) {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+// TODO(erg): linux_aura bringup: http://crbug.com/163931
+#define MAYBE_Cpu DISABLED_Cpu
+#else
+#define MAYBE_Cpu Cpu
+#endif
+
+IN_PROC_BROWSER_TEST_F(SystemCpuApiTest, MAYBE_Cpu) {
CpuInfoProvider* provider = new MockCpuInfoProviderImpl();
// The provider is owned by the single CpuInfoProvider instance.
CpuInfoProvider::InitializeForTesting(provider);
« no previous file with comments | « chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc ('k') | chrome/browser/extensions/app_process_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698