Revert 175759 (minus use of kForceGpuMemAvailableMb flag)

content/common/gpu/gpu_memory_manager.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 "content/common/gpu/gpu_memory_manager.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 403 matching lines @@
     const GpuMemoryTrackingGroup* tracking_group = i->second;
     video_memory_usage_stats->process_map[
         tracking_group->GetPid()].video_memory += tracking_group->GetSize();
   }
 
   // Assign the total across all processes in the GPU process
   video_memory_usage_stats->process_map[
       base::GetCurrentProcId()].video_memory = GetCurrentUsage();
   video_memory_usage_stats->process_map[
       base::GetCurrentProcId()].has_duplicates = true;
+
+  video_memory_usage_stats->bytes_allocated = GetCurrentUsage();
+  video_memory_usage_stats->bytes_allocated_historical_max =
+      bytes_allocated_historical_max_;
 }
 
 void GpuMemoryManager::SetWindowCount(uint32 window_count) {
   bool should_schedule_manage = !window_count_has_been_received_ ||
                                 (window_count != window_count_);
   window_count_has_been_received_ = true;
   window_count_ = window_count;
   if (should_schedule_manage)
     ScheduleManage(true);
 }
@@ skipping 259 matching lines @@
 
 void GpuMemoryManager::RemoveClientFromList(
     GpuMemoryManagerClientState* client_state) {
   DCHECK(client_state->list_iterator_valid_);
   ClientStateList* client_list = GetClientList(client_state);
   client_list->erase(client_state->list_iterator_);
   client_state->list_iterator_valid_ = false;
 }
 
 }  // namespace content