Browser Plugin: Rename old colliding files to old_*.

content/browser/browser_plugin/old/old_browser_plugin_host.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H__
-#define CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H__
+#ifndef CONTENT_BROWSER_BROWSER_PLUGIN_OLD_OLD_BROWSER_PLUGIN_HOST_H__
+#define CONTENT_BROWSER_BROWSER_PLUGIN_OLD_OLD_BROWSER_PLUGIN_HOST_H__
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "ppapi/c/pp_instance.h"
 #include "ui/gfx/size.h"
@@ skipping 10 matching lines @@
 
 namespace old {
 
 
 // A BrowserPluginHost object is used by both embedders and guests.
 // The primary purpose of BrowserPluginHost is to allow an embedder
 // to manage the lifetime of its guests. It cleans up its guests
 // on navigation, crashes, and "hides" guests when it hides.
 // For the guest, BrowserPluginHost keeps track of its embedder,
 // and its BrowserPlugin instance ID.
 class BrowserPluginHost : public WebContentsObserver,

[Charlie Reis, 2012/08/07 23:58:29]

I suppose we don't need to rename the class itself, since it's going to be
removed shortly anyway.  It won't cause name conflicts because of the "old"
namespace, correct?

                           public NotificationObserver,
                           public WebContentsDelegate {
  public:
   // BrowserPluginHost is owned by a WebContentsImpl. Here it takes in its
   // owner. The owner can be either a guest or embedder WebContents.
   explicit BrowserPluginHost(WebContentsImpl* web_contents);
 
   virtual ~BrowserPluginHost();
 
   void ConnectEmbedderToChannel(RenderViewHost* render_view_host,
@@ skipping 78 matching lines @@
   int instance_id_;
   GuestMap guests_;
   ContainerInstanceMap guests_by_container_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginHost);
 };
 
 }  // namespace old
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_OLD_BROWSER_PLUGIN_HOST_H_
+#endif  // CONTENT_BROWSER_BROWSER_PLUGIN_OLD_OLD_BROWSER_PLUGIN_HOST_H_