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

Unified Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 167953003: cc: Remove the --enable-partial-swap flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: enablepartialswap: build Created 6 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
Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index 7be9f16e275db2c45b0ebf08628b86bddeb05ed9..b9c11762a6c55020e9f1517d9962d78f41470d37 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -824,12 +824,6 @@ class BrowserPluginThreadedCompositorPixelTest
EnablePixelOutput();
BrowserPluginThreadedCompositorTest::SetUp();
}
-
- virtual void SetUpCommandLine(CommandLine* cmd) OVERRIDE {
- BrowserPluginThreadedCompositorTest::SetUpCommandLine(cmd);
- // http://crbug.com/327035
- cmd->AppendSwitch(switches::kDisableDelegatedRenderer);
- }
};
static void CompareSkBitmaps(const SkBitmap& expected_bitmap,
@@ -896,8 +890,9 @@ static void CompareSkBitmapAndRun(const base::Closure& callback,
callback.Run();
}
-// http://crbug.com/171744
-#if defined(OS_MACOSX)
+// Mac: http://crbug.com/171744
+// Aura/Ubercomp: http://crbug.com//327035
+#if defined(OS_MACOSX) || defined(USE_AURA)
#define MAYBE_GetBackingStore DISABLED_GetBackingStore
#else
#define MAYBE_GetBackingStore GetBackingStore
« no previous file with comments | « chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698