A patch to fix a couple of issues in interactive_ui_tests on ChromeOS

chrome/browser/views/frame/browser_view.cc

Index: chrome/browser/views/frame/browser_view.cc
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index 93ab8f4f6556502e640b38a3e5c4982d76011504..7ead4405f3229ce8033dab9eef1021e427c27435 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -93,9 +93,6 @@ using base::TimeDelta;
 using views::ColumnSet;
 using views::GridLayout;
 
-// static
-SkBitmap BrowserView::default_favicon_;
-SkBitmap BrowserView::otr_avatar_;
 // The height of the status bubble.
 static const int kStatusBubbleHeight = 20;
 // The name of a key to store on the window handle so that other code can
@@ -420,7 +417,6 @@ BrowserView::BrowserView(Browser* browser)
       extension_shelf_(NULL),
       last_focused_view_storage_id_(
           views::ViewStorage::GetSharedInstance()->CreateStorageID()) {
-  InitClass();
   browser_->tabstrip_model()->AddObserver(this);
 }
 
@@ -621,11 +617,13 @@ TabContents* BrowserView::GetSelectedTabContents() const {
 }
 
 SkBitmap BrowserView::GetOTRAvatarIcon() {
-  if (otr_avatar_.isNull()) {
+  static SkBitmap* otr_avatar_ = new SkBitmap();
+
+  if (otr_avatar_->isNull()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    otr_avatar_ = *rb.GetBitmapNamed(IDR_OTR_ICON);
+    *otr_avatar_ = *rb.GetBitmapNamed(IDR_OTR_ICON);
   }
-  return otr_avatar_;
+  return *otr_avatar_;
 }
 
 #if defined(OS_WIN)
@@ -2148,16 +2146,6 @@ void BrowserView::InitHangMonitor() {
 #endif
 }
 
-// static
-void BrowserView::InitClass() {
-  static bool initialized = false;
-  if (!initialized) {
-    ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    default_favicon_ = *rb.GetBitmapNamed(IDR_DEFAULT_FAVICON);
-    initialized = true;
-  }
-}
-
 #if !defined(OS_CHROMEOS)
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {