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

chrome/browser/views/frame/browser_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 516 matching lines @@
 
   // True if we have already been initialized.
   bool initialized_;
 
   // True if we should ignore requests to layout.  This is set while toggling
   // fullscreen mode on and off to reduce jankiness.
   bool ignore_layout_;
 
   scoped_ptr<FullscreenExitBubble> fullscreen_bubble_;
 
-  // The default favicon image.
-  static SkBitmap default_favicon_;
-
-  // The OTR avatar image.
-  static SkBitmap otr_avatar_;
-
 #if defined(OS_WIN)
   // The additional items we insert into the system menu.
   scoped_ptr<views::SystemMenuModel> system_menu_contents_;
   scoped_ptr<ZoomMenuModel> zoom_menu_contents_;
   scoped_ptr<EncodingMenuModel> encoding_menu_contents_;
   // The wrapped system menu itself.
   scoped_ptr<views::NativeMenuWin> system_menu_;
 
   // This object is used to perform periodic actions in a worker
   // thread. It is currently used to monitor hung plugin windows.
@@ skipping 28 matching lines @@
 
   // Last focused view that issued a tab traversal.
   int last_focused_view_storage_id_;
 
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_