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

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 75 matching lines @@
 #include "chrome/browser/jumplist.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/views/accelerator_table_gtk.h"
 #include "views/window/hit_test.h"
 #endif
 
 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
 // locate this object using just the handle.
 #if defined(OS_WIN)
 static const wchar_t* kBrowserViewKey = L"__BROWSER_VIEW__";
 #else
 static const char* kBrowserViewKey = "__BROWSER_VIEW__";
 #endif
 // How frequently we check for hung plugin windows.
@@ skipping 304 matching lines @@
       contents_split_(NULL),
       initialized_(false),
       ignore_layout_(false),
 #if defined(OS_WIN)
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
       extension_shelf_(NULL),
       last_focused_view_storage_id_(
           views::ViewStorage::GetSharedInstance()->CreateStorageID()) {
-  InitClass();
   browser_->tabstrip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
   browser_->tabstrip_model()->RemoveObserver(this);
 
 #if defined(OS_WIN)
   // Remove this observer.
   if (aeropeek_manager_.get())
     browser_->tabstrip_model()->RemoveObserver(aeropeek_manager_.get());
@@ skipping 180 matching lines @@
 void BrowserView::ActivationChanged(bool activated) {
   if (activated)
     BrowserList::SetLastActive(browser_.get());
 }
 
 TabContents* BrowserView::GetSelectedTabContents() const {
   return browser_->GetSelectedTabContents();
 }
 
 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)
 void BrowserView::PrepareToRunSystemMenu(HMENU menu) {
   system_menu_->UpdateStates();
 }
 #endif
 
 void BrowserView::TraverseNextAccessibleToolbar(bool forward) {
   // TODO(mohamed) This needs to be smart, that applies to all toolbars.
@@ skipping 1502 matching lines @@
     ticker_.Start();
 
     pref_service->SetInteger(prefs::kPluginMessageResponseTimeout,
                              plugin_message_response_timeout);
     pref_service->SetInteger(prefs::kHungPluginDetectFrequency,
                              hung_plugin_detect_freq);
   }
 #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) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
   BrowserView* view = new BrowserView(browser);
   BrowserFrame::Create(view, browser->profile());
 
   view->GetWindow()->GetNonClientView()->
       SetAccessibleName(l10n_util::GetString(IDS_PRODUCT_NAME));
 
   return view;
 }
 #endif
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }