Revert 270907 "Remove knowledge of nacl from content."

trunk/src/chrome/browser/task_manager/task_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 CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
 #define CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 333 matching lines @@
 #else
   static const int kUpdateTimeMs = 1000;
 #endif
 
   // Values cached per resource. Values are validated on demand. The is_XXX
   // members indicate if a value is valid.
   struct PerResourceValues {
     PerResourceValues();
     ~PerResourceValues();
 
+    bool is_nacl_debug_stub_port_valid;
+    int nacl_debug_stub_port;
+
     bool is_title_valid;
     base::string16 title;
 
     bool is_profile_name_valid;
     base::string16 profile_name;
 
     // No is_network_usage since default (0) is fine.
     int64 network_usage;
 
     bool is_process_id_valid;
@@ skipping 39 matching lines @@
     size_t video_memory;
     bool video_memory_has_duplicates;
 
     bool is_gdi_handles_valid;
     size_t gdi_handles;
     size_t gdi_handles_peak;
 
     bool is_user_handles_valid;
     size_t user_handles;
     size_t user_handles_peak;
-
-    bool is_nacl_debug_stub_port_valid;
-    int nacl_debug_stub_port;
   };
 
   typedef std::vector<task_manager::Resource*> ResourceList;
   typedef std::vector<scoped_refptr<task_manager::ResourceProvider> >
       ResourceProviderList;
   typedef std::map<base::ProcessHandle, ResourceList*> GroupMap;
   typedef std::map<base::ProcessHandle, base::ProcessMetrics*> MetricsMap;
   typedef std::map<task_manager::Resource*, int64> ResourceValueMap;
   typedef std::map<task_manager::Resource*,
                    PerResourceValues> PerResourceCache;
@@ skipping 138 matching lines @@
   // All per-Resource values are stored here.
   mutable PerResourceCache per_resource_cache_;
 
   // All per-Process values are stored here.
   mutable PerProcessCache per_process_cache_;
 
   DISALLOW_COPY_AND_ASSIGN(TaskManagerModel);
 };
 
 #endif  // CHROME_BROWSER_TASK_MANAGER_TASK_MANAGER_H_