Revert 270907 "Remove knowledge of nacl from content."

trunk/src/components/nacl/browser/nacl_browser.h

 // Copyright 2013 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 COMPONENTS_NACL_BROWSER_NACL_BROWSER_H_
 #define COMPONENTS_NACL_BROWSER_NACL_BROWSER_H_
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/containers/mru_cache.h"
 #include "base/files/file.h"
 #include "base/memory/singleton.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "components/nacl/browser/nacl_browser_delegate.h"
 #include "components/nacl/browser/nacl_validation_cache.h"
 
 class URLPattern;
 class GURL;
 
 namespace base {
 class FileProxy;
 }
 
 namespace nacl {
 
-static const int kGdbDebugStubPortUnknown = -1;
-static const int kGdbDebugStubPortUnused = 0;
-
 // Open an immutable executable file that can be mmapped.
 // This function should only be called on a thread that can perform file IO.
 base::File OpenNaClExecutableImpl(const base::FilePath& file_path);
 
 // Represents shared state for all NaClProcessHost objects in the browser.
 class NaClBrowser {
  public:
   static NaClBrowser* GetInstance();
 
   // Will it be possible to launch a NaCl process, eventually?
@@ skipping 20 matching lines @@
   const base::FilePath& GetIrtFilePath();
 
   // IRT file handle, only available when IsReady().
   const base::File& IrtFile() const;
 
   // Methods for testing GDB debug stub in browser. If test adds debug stub
   // port listener, Chrome will allocate a currently-unused TCP port number for
   // debug stub server instead of a fixed one.
 
   // Notify listener that new debug stub TCP port is allocated.
-  void SetProcessGdbDebugStubPort(int process_id, int port);
+  void FireGdbDebugStubPortOpened(int port);
+  bool HasGdbDebugStubPortListener();
   void SetGdbDebugStubPortListener(base::Callback<void(int)> listener);
   void ClearGdbDebugStubPortListener();
 
-  int GetProcessGdbDebugStubPort(int process_id);
-
   bool ValidationCacheIsEnabled() const {
     return validation_cache_is_enabled_;
   }
 
   const std::string& GetValidationCacheKey() const {
     return validation_cache_.GetValidationCacheKey();
   }
 
   // The NaCl singleton keeps information about NaCl executable files opened via
   // PPAPI.  This allows the NaCl process to get trusted information about the
@@ skipping 27 matching lines @@
 #if defined(OS_WIN)
   // Get path to NaCl loader on the filesystem if possible.
   // |exe_path| does not change if the method fails.
   bool GetNaCl64ExePath(base::FilePath* exe_path);
 #endif
 
   void EarlyStartup();
   static void SetDelegate(NaClBrowserDelegate* delegate);
   static NaClBrowserDelegate* GetDelegate();
 
-  // Each time a NaCl process ends, the browser is notified.
-  void OnProcessEnd(int process_id);
   // Support for NaCl crash throttling.
   // Each time a NaCl module crashes, the browser is notified.
   void OnProcessCrashed();
   // If "too many" crashes occur within a given time period, NaCl is throttled
   // until the rate again drops below the threshold.
   bool IsThrottled();
 
  private:
   friend struct DefaultSingletonTraits<NaClBrowser>;
 
@@ skipping 34 matching lines @@
   base::FilePath irt_filepath_;
   NaClResourceState irt_state_;
   NaClValidationCache validation_cache_;
   NaClValidationCache off_the_record_validation_cache_;
   base::FilePath validation_cache_file_path_;
   bool validation_cache_is_enabled_;
   bool validation_cache_is_modified_;
   NaClResourceState validation_cache_state_;
   base::Callback<void(int)> debug_stub_port_listener_;
 
-  // Map from process id to debug stub port if any.
-  typedef std::map<int, int> GdbDebugStubPortMap;
-  GdbDebugStubPortMap gdb_debug_stub_port_map_;
-
   typedef base::HashingMRUCache<std::string, base::FilePath> PathCacheType;
   PathCacheType path_cache_;
 
   bool ok_;
 
   // A list of pending tasks to start NaCl processes.
   std::vector<base::Closure> waiting_;
 
   scoped_ptr<NaClBrowserDelegate> browser_delegate_;
 
   std::deque<base::Time> crash_times_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClBrowser);
 };
 
 } // namespace nacl
 
 #endif  // COMPONENTS_NACL_BROWSER_NACL_BROWSER_H_