Revert 270907 "Remove knowledge of nacl from content."

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

 // 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.
 
 #include "components/nacl/browser/nacl_browser.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_proxy.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 254 matching lines @@
   } else {
     LOG(ERROR) << "Failed to open NaCl IRT file \""
                << irt_filepath_.LossyDisplayName()
                << "\": " << error_code;
     MarkAsFailed();
   }
   irt_state_ = NaClResourceReady;
   CheckWaiting();
 }
 
-void NaClBrowser::SetProcessGdbDebugStubPort(int process_id, int port) {
-  gdb_debug_stub_port_map_[process_id] = port;
-  if (port != kGdbDebugStubPortUnknown &&
-      !debug_stub_port_listener_.is_null()) {
-    content::BrowserThread::PostTask(
-        content::BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(debug_stub_port_listener_, port));
-  }
+void NaClBrowser::FireGdbDebugStubPortOpened(int port) {
+  content::BrowserThread::PostTask(
+      content::BrowserThread::IO,
+      FROM_HERE,
+      base::Bind(debug_stub_port_listener_, port));
+}
+
+bool NaClBrowser::HasGdbDebugStubPortListener() {
+  return !debug_stub_port_listener_.is_null();
 }
 
 void NaClBrowser::SetGdbDebugStubPortListener(
     base::Callback<void(int)> listener) {
   debug_stub_port_listener_ = listener;
 }
 
 void NaClBrowser::ClearGdbDebugStubPortListener() {
   debug_stub_port_listener_.Reset();
 }
 
-int NaClBrowser::GetProcessGdbDebugStubPort(int process_id) {
-  GdbDebugStubPortMap::iterator i = gdb_debug_stub_port_map_.find(process_id);
-  if (i != gdb_debug_stub_port_map_.end()) {
-    return i->second;
-  }
-  return kGdbDebugStubPortUnused;
-}
-
 void NaClBrowser::InitValidationCacheFilePath() {
   // Determine where the validation cache resides in the file system.  It
   // exists in Chrome's cache directory and is not tied to any specific
   // profile.
   // Start by finding the user data directory.
   base::FilePath user_data_dir;
   if (!browser_delegate_->GetUserDirectory(&user_data_dir)) {
     RunWithoutValidationCache();
     return;
   }
@@ skipping 222 matching lines @@
     // The task is sequenced so that multiple writes happen in order.
     content::BrowserThread::PostBlockingPoolSequencedTask(
         kValidationCacheSequenceName,
         FROM_HERE,
         base::Bind(WriteCache, validation_cache_file_path_,
                    base::Owned(pickle)));
   }
   validation_cache_is_modified_ = false;
 }
 
-void NaClBrowser::OnProcessEnd(int process_id) {
-  gdb_debug_stub_port_map_.erase(process_id);
-}
-
 void NaClBrowser::OnProcessCrashed() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (crash_times_.size() == kMaxCrashesPerInterval) {
     crash_times_.pop_front();
   }
   base::Time time = base::Time::Now();
   crash_times_.push_back(time);
 }
 
 bool NaClBrowser::IsThrottled() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   if (crash_times_.size() != kMaxCrashesPerInterval) {
     return false;
   }
   base::TimeDelta delta = base::Time::Now() - crash_times_.front();
   return delta.InSeconds() <= kCrashesIntervalInSeconds;
 }
 
 }  // namespace nacl