base: Fix parsing and add dalvik-heap-limit

ui/gl/gl_context_egl.cc

Index: ui/gl/gl_context_egl.cc
diff --git a/ui/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc
index f8460d339129ed5dfb28d562c7df433e4af4e83c..52c60e25e8902889995328672bd866fee7a2cdee 100644
--- a/ui/gl/gl_context_egl.cc
+++ b/ui/gl/gl_context_egl.cc
@@ -182,4 +182,12 @@ 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