base: Fix parsing and add dalvik-heap-limit

ui/gl/gl_context_egl.cc

 // Copyright (c) 2012 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 "ui/gl/gl_context_egl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
@@ skipping 164 matching lines @@
 }
 
 bool GLContextEGL::WasAllocatedUsingRobustnessExtension() {
   return GLSurfaceEGL::IsCreateContextRobustnessSupported();
 }
 
 GLContextEGL::~GLContextEGL() {
   Destroy();
 }
 
+#if !defined(OS_ANDROID)

[jar (doing other things), 2013/02/14 01:48:41]

nit: Given that you didn't ifdef the declaration, why is the implementation
ifdef'ed?

[epenner, 2013/02/14 04:18:36]

The function is defined in the "gl_context_android.cc" file, which is only in
the android build. The cleanest way I suppose would be to make an entirely new
derived class such that we could override this method on Android only, but given
the "_android" file already exists to serve a similar purpose, I was hoping this
was acceptable for this minor platform difference. 

+bool GLContextEGL::GetTotalGpuMemory(size_t* bytes) {
+  DCHECK(bytes);
+  *bytes = 0;
+  return false;
+}
+#endif
+
 }  // namespace gfx