Misc. infobar stuff:

chrome/browser/ui/views/infobars/infobar_view.h

Index: chrome/browser/ui/views/infobars/infobar_view.h
===================================================================
--- chrome/browser/ui/views/infobars/infobar_view.h	(revision 86331)
+++ chrome/browser/ui/views/infobars/infobar_view.h	(working copy)
@@ -7,9 +7,9 @@
 #pragma once
 
 #include "base/task.h"
-#include "chrome/browser/ui/views/infobars/infobar.h"
+#include "chrome/browser/tab_contents/infobar.h"
+#include "chrome/browser/tab_contents/infobar_container.h"
 #include "chrome/browser/ui/views/infobars/infobar_background.h"
-#include "chrome/browser/ui/views/infobars/infobar_container.h"
 #include "views/controls/button/button.h"
 #include "views/focus/focus_manager.h"
 
@@ -32,7 +32,7 @@
                     public views::ButtonListener,
                     public views::FocusChangeListener {
  public:
-  explicit InfoBarView(InfoBarDelegate* delegate);
+  InfoBarView(TabContentsWrapper* owner, InfoBarDelegate* delegate);
 
   SkPath* fill_path() const { return fill_path_.get(); }
   SkPath* stroke_path() const { return stroke_path_.get(); }