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

Unified Diff: content/child/child_discardable_shared_memory_manager_browsertest.cc

Issue 952833004: content: Re-enable ChildDiscardableSharedMemoryManager browser tests on ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/child/child_discardable_shared_memory_manager_browsertest.cc
diff --git a/content/child/child_discardable_shared_memory_manager_browsertest.cc b/content/child/child_discardable_shared_memory_manager_browsertest.cc
index 18598fbdbb0e3818ab0574a1ec32069178f952c9..e4610f6d482aefcc0643a3baa973a843fcf30844 100644
--- a/content/child/child_discardable_shared_memory_manager_browsertest.cc
+++ b/content/child/child_discardable_shared_memory_manager_browsertest.cc
@@ -15,16 +15,11 @@
namespace content {
-// ChromeOS does not do software compositing, so kDisableGpu is not available
-// there.
-#if !defined(OS_CHROMEOS)
-
class ChildDiscardableSharedMemoryManagerBrowserTest
: public ContentBrowserTest {
public:
void SetUpCommandLine(base::CommandLine* command_line) override {
command_line->AppendSwitch(switches::kSingleProcess);
- command_line->AppendSwitch(switches::kDisableGpu);
}
static void ReleaseFreeMemory() {
@@ -122,6 +117,4 @@ IN_PROC_BROWSER_TEST_F(ChildDiscardableSharedMemoryManagerBrowserTest,
}
}
-#endif // !OS_CHROMEOS
-
} // content
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698