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

chrome/renderer/visitedlink_slave.h

 // Copyright (c) 2006-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_WIN_RENDERER_VISITEDLINK_SLAVE_H__
-#define CHROME_WIN_RENDERER_VISITEDLINK_SLAVE_H__
+#ifndef CHROME_RENDERER_VISITEDLINK_SLAVE_H_
+#define CHROME_RENDERER_VISITEDLINK_SLAVE_H_
 
 #include "base/shared_memory.h"
 #include "chrome/common/visitedlink_common.h"
 
 // Reads the link coloring database provided by the master. There can be any
 // number of slaves reading the same database.
 class VisitedLinkSlave : public VisitedLinkCommon
 {
  public:
   VisitedLinkSlave();
   virtual ~VisitedLinkSlave();
 
   // Called to initialize this object, nothing will work until this is called.
   // It can also be called again at any time to update the table that we're
   // using. The handle should be the handle generated by the VisitedLinkMaster.
   // Returns true on success.
-  bool Init(SharedMemoryHandle shared_memory);
+  bool Init(base::SharedMemoryHandle shared_memory);
 
  private:
   void FreeTable();
 
   // shared memory consists of a SharedHeader followed by the table
-  SharedMemory* shared_memory_;
+  base::SharedMemory* shared_memory_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(VisitedLinkSlave);
+  DISALLOW_COPY_AND_ASSIGN(VisitedLinkSlave);
 };
 
-#endif // WIN_RENDERER_VISITEDLINK_SLAVE_H__
+#endif  // CHROME_RENDERER_VISITEDLINK_SLAVE_H_