base: Fix parsing and add dalvik-heap-limit

content/common/gpu/gpu_memory_manager.h

 // 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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_
 
 #include <list>
 #include <map>
 
@@ skipping 146 matching lines @@
   uint64 GetMaximumClientAllocation() const;
   uint64 GetMinimumClientAllocation() const {
     return bytes_minimum_per_client_;
   }
   // The default amount of memory that a client is assigned, if it has not
   // reported any memory usage stats yet.
   uint64 GetDefaultClientAllocation() const {
     return bytes_default_per_client_;
   }
 
-  // Get a reasonable memory limit from a viewport's surface area.
-  static uint64 CalcAvailableFromViewportArea(int viewport_area);
+  // On Android only, estimate memory limite from Dalvik heap size.

[ccameron, 2013/02/11 20:05:33]

s/limite/limit

+  static uint64 CalcAvailableFromDalvikHeap();
+
   static uint64 CalcAvailableFromGpuTotal(uint64 total_gpu_memory);
 
   // Send memory usage stats to the browser process.
   void SendUmaStatsToBrowser();
 
   // Get the current number of bytes allocated.
   uint64 GetCurrentUsage() const {
     return bytes_allocated_managed_current_ +
         bytes_allocated_unmanaged_current_;
   }
@@ skipping 104 matching lines @@
 
   // Used to disable automatic changes to Manage() in testing.
   bool disable_schedule_manage_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryManager);
 };
 
 }  // namespace content
 
 #endif // CONTENT_COMMON_GPU_GPU_MEMORY_MANAGER_H_