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

chrome/renderer/greasemonkey_slave.h

 // Copyright (c) 2008 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_RENDERER_GREASEMONKEY_SLAVE_H__
-#define CHROME_RENDERER_GREASEMONKEY_SLAVE_H__
+#ifndef CHROME_RENDERER_GREASEMONKEY_SLAVE_H_
+#define CHROME_RENDERER_GREASEMONKEY_SLAVE_H_
 
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/glue/webframe.h"
 
 
 // Parsed representation of a Greasemonkey script.
@@ skipping 51 matching lines @@
   std::vector<std::string> include_patterns_;
 };
 
 
 // Manages installed GreasemonkeyScripts for a render process.
 class GreasemonkeySlave {
  public:
   GreasemonkeySlave();
 
   // Update the parsed scripts from shared memory.
-  bool UpdateScripts(SharedMemoryHandle shared_memory);
+  bool UpdateScripts(base::SharedMemoryHandle shared_memory);
 
   // Inject the appropriate scripts into a frame based on its URL.
   // TODO(aa): Extract a GreasemonkeyFrame interface out of this to improve
   // testability.
   bool InjectScripts(WebFrame* frame);
 
  private:
   // Shared memory containing raw script data.
-  scoped_ptr<SharedMemory> shared_memory_;
+  scoped_ptr<base::SharedMemory> shared_memory_;
 
   // Parsed script data.
   std::vector<GreasemonkeyScript> scripts_;
 
   DISALLOW_COPY_AND_ASSIGN(GreasemonkeySlave);
 };
 
-#endif // CHROME_RENDERER_GREASEMONKEY_SLAVE_H__
+#endif  // CHROME_RENDERER_GREASEMONKEY_SLAVE_H_