Add Terminate() to the Process object, have RenderProcessHost use this to avo...

chrome/browser/greasemonkey_master.h

Index: chrome/browser/greasemonkey_master.h
===================================================================
--- chrome/browser/greasemonkey_master.h	(revision 5371)
+++ chrome/browser/greasemonkey_master.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GREASEMONKEY_MASTER_H__
-#define CHROME_BROWSER_GREASEMONKEY_MASTER_H__
+#ifndef CHROME_BROWSER_GREASEMONKEY_MASTER_H_
+#define CHROME_BROWSER_GREASEMONKEY_MASTER_H_
 
 #include "base/directory_watcher.h"
 #include "base/process.h"
@@ -24,12 +24,12 @@
   ~GreasemonkeyMaster();
 
   // Gets the segment of shared memory for the scripts.
-  SharedMemory* GetSharedMemory() const {
+  base::SharedMemory* GetSharedMemory() const {
     return shared_memory_.get();
   }
 
   // Called by the script reloader when new scripts have been loaded.
-  void NewScriptsAvailable(SharedMemory* handle);
+  void NewScriptsAvailable(base::SharedMemory* handle);
 
   // Return true if we have any scripts ready.
   bool ScriptsReady() const { return shared_memory_.get() != NULL; }
@@ -59,7 +59,7 @@
   scoped_refptr<ScriptReloader> script_reloader_;
 
   // Contains the scripts that were found the last time scripts were updated.
-  scoped_ptr<SharedMemory> shared_memory_;
+  scoped_ptr<base::SharedMemory> shared_memory_;
 
   // If the script directory is modified while we're rescanning it, we note
   // that we're currently mid-scan and then start over again once the scan
@@ -69,4 +69,4 @@
   DISALLOW_COPY_AND_ASSIGN(GreasemonkeyMaster);
 };
 
-#endif // CHROME_BROWSER_GREASEMONKEY_MASTER_H__
+#endif  // CHROME_BROWSER_GREASEMONKEY_MASTER_H_