Fix crasher in GetDefaultSearchEngineName() in first run bubble....

chrome/browser/views/first_run_bubble.cc

 // Copyright (c) 2006-2008 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/first_run_bubble.h"
 
 #include "base/win_util.h"
 #include "chrome/app/locales/locale_settings.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
@@ skipping 11 matching lines @@
 
 #include "chromium_strings.h"
 #include "generated_resources.h"
 
 namespace {
 
 // How much extra padding to put around our content over what
 // infobubble provides.
 static const int kBubblePadding = 4;
 
-std::wstring GetDefaultSearchEngineName() {
-  Browser* browser = BrowserList::GetLastActive();
-  DCHECK(browser);
+std::wstring GetDefaultSearchEngineName(Profile* profile) {
+  if (!profile) {
+    NOTREACHED();
+    return std::wstring();
+  }
   const TemplateURL* const default_provider =
-      browser->profile()->GetTemplateURLModel()->GetDefaultSearchProvider();
+      profile->GetTemplateURLModel()->GetDefaultSearchProvider();
   if (!default_provider) {
     // TODO(cpu): bug 1187517. It is possible to have no default provider.
     // returning an empty string is a stopgap measure for the crash
     // http://code.google.com/p/chromium/issues/detail?id=2573
     return std::wstring();
   }
   return default_provider->short_name();
 }
 
 }  // namespace
 
 // Implements the client view inside the first run bubble. It is kind of a
 // dialog-ish view, but is not a true dialog.
 class FirstRunBubbleView : public views::View,
                            public views::NativeButton::Listener {
  public:
-  explicit FirstRunBubbleView(FirstRunBubble* bubble_window)
+  FirstRunBubbleView(FirstRunBubble* bubble_window, Profile* profile)
       : bubble_window_(bubble_window),
         label1_(NULL),
         label2_(NULL),
         label3_(NULL),
         keep_button_(NULL),
         change_button_(NULL) {
     ChromeFont& font =
         ResourceBundle::GetSharedInstance().GetFont(ResourceBundle::MediumFont);
 
     label1_ = new views::Label(l10n_util::GetString(IDS_FR_BUBBLE_TITLE));
     label1_->SetFont(font.DeriveFont(3, ChromeFont::BOLD));
     label1_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     AddChildView(label1_);
 
     gfx::Size ps = GetPreferredSize();
 
     label2_ = new views::Label(l10n_util::GetString(IDS_FR_BUBBLE_SUBTEXT));
     label2_->SetMultiLine(true);
     label2_->SetFont(font);
     label2_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     label2_->SizeToFit(ps.width() - kBubblePadding * 2);
     AddChildView(label2_);
 
     std::wstring question_str
         = l10n_util::GetStringF(IDS_FR_BUBBLE_QUESTION,
-                                GetDefaultSearchEngineName());
+                                GetDefaultSearchEngineName(profile));
     label3_ = new views::Label(question_str);
     label3_->SetMultiLine(true);
     label3_->SetFont(font);
     label3_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
     label3_->SizeToFit(ps.width() - kBubblePadding * 2);
     AddChildView(label3_);
 
-    std::wstring keep_str = l10n_util::GetStringF(IDS_FR_BUBBLE_OK,
-                                                  GetDefaultSearchEngineName());
+    std::wstring keep_str =
+        l10n_util::GetStringF(IDS_FR_BUBBLE_OK,
+                              GetDefaultSearchEngineName(profile));
     keep_button_ = new views::NativeButton(keep_str, true);
     keep_button_->SetListener(this);
     AddChildView(keep_button_);
 
     std::wstring change_str = l10n_util::GetString(IDS_FR_BUBBLE_CHANGE);
     change_button_ = new views::NativeButton(change_str);
     change_button_->SetListener(this);
     AddChildView(change_button_);
   }
 
@@ skipping 97 matching lines @@
 }
 
 void FirstRunBubble::InfoBubbleClosing(InfoBubble* info_bubble,
                                        bool closed_by_escape) {
   // Make sure our parent window is re-enabled.
   if (!IsWindowEnabled(GetParent()))
     ::EnableWindow(GetParent(), true);
   enable_window_method_factory_.RevokeAll();
 }
 
-FirstRunBubble* FirstRunBubble::Show(HWND parent_hwnd,
+FirstRunBubble* FirstRunBubble::Show(Profile* profile, HWND parent_hwnd,
                                      const gfx::Rect& position_relative_to) {
   FirstRunBubble* window = new FirstRunBubble();
-  views::View* view = new FirstRunBubbleView(window);
+  views::View* view = new FirstRunBubbleView(window, profile);
   window->SetDelegate(window);
   window->Init(parent_hwnd, position_relative_to, view);
   window->ShowWindow(SW_SHOW);
   return window;
 }
 
 void FirstRunBubble::EnableParent() {
   ::EnableWindow(GetParent(), true);
 }