Re-land: content: Enable native GpuMemoryBuffers by default on MacOSX.

content/child/child_thread_impl_browsertest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/discardable_memory.h"
 #include "base/memory/scoped_vector.h"
 #include "base/time/time.h"
 #include "content/child/child_discardable_shared_memory_manager.h"
@@ skipping 122 matching lines @@
  public:
   // Overridden from BrowserTestBase:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ChildThreadImplBrowserTest::SetUpCommandLine(command_line);
     NativeBufferFlag native_buffer_flag = ::testing::get<0>(GetParam());
     switch (native_buffer_flag) {
       case kEnableNativeBuffers:
         command_line->AppendSwitch(switches::kEnableNativeGpuMemoryBuffers);
         break;
       case kDisableNativeBuffers:
+        command_line->AppendSwitch(switches::kDisableNativeGpuMemoryBuffers);
         break;
     }
   }
 };
 
 IN_PROC_BROWSER_TEST_P(ChildThreadImplGpuMemoryBufferBrowserTest,
                        DISABLED_Map) {
   gfx::GpuMemoryBuffer::Format format = ::testing::get<1>(GetParam());
   gfx::Size buffer_size(4, 4);
 
@@ skipping 47 matching lines @@
                                          kEnableNativeBuffers),
                        // These formats are guaranteed to work on all platforms.
                        ::testing::Values(gfx::GpuMemoryBuffer::R_8,
                                          gfx::GpuMemoryBuffer::RGBA_4444,
                                          gfx::GpuMemoryBuffer::RGBA_8888,
                                          gfx::GpuMemoryBuffer::BGRA_8888,
                                          gfx::GpuMemoryBuffer::YUV_420)));
 
 }  // namespace
 }  // namespace content