Make chrome::Navigate take in a Browser* that is never NULL. That function doesn't have a context, …

chrome/browser/ui/webui/web_dialog_web_contents_delegate.cc

 // Copyright (c) 2012 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/ui/webui/web_dialog_web_contents_delegate.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "content/public/browser/web_contents.h"
 
 using content::OpenURLParams;
 using content::WebContents;
 
 // Incognito profiles are not long-lived, so we always want to store a
 // non-incognito profile.
@@ skipping 22 matching lines @@
   return new_contents;
 }
 
 // static
 Browser* WebDialogWebContentsDelegate::StaticOpenURLFromTab(
     Profile* profile, WebContents* source, const OpenURLParams& params,
     WebContents** out_new_contents) {
   if (!profile)
     return NULL;
 
-  // Specify a NULL browser for navigation. This will cause Navigate()
-  // to find a browser matching params.profile or create a new one.
-  Browser* browser = NULL;
+  Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
   chrome::NavigateParams nav_params(browser, params.url, params.transition);
-  nav_params.profile = profile;
   nav_params.referrer = params.referrer;
   if (source && source->IsCrashed() &&
       params.disposition == CURRENT_TAB &&
       params.transition == content::PAGE_TRANSITION_LINK) {
     nav_params.disposition = NEW_FOREGROUND_TAB;
   } else {
     nav_params.disposition = params.disposition;
   }
   nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   nav_params.user_gesture = true;
@@ skipping 15 matching lines @@
 Browser* WebDialogWebContentsDelegate::StaticAddNewContents(
     Profile* profile,
     WebContents* source,
     WebContents* new_contents,
     WindowOpenDisposition disposition,
     const gfx::Rect& initial_pos,
     bool user_gesture) {
   if (!profile)
     return NULL;
 
-  // Specify a NULL browser for navigation. This will cause Navigate()
-  // to find a browser matching params.profile or create a new one.
-  Browser* browser = NULL;
-
+  Browser* browser = browser::FindOrCreateTabbedBrowser(profile);
   TabContents* tab_contents = new TabContents(new_contents);
   chrome::NavigateParams params(browser, tab_contents);
-  params.profile = profile;
   // TODO(pinkerton): no way to get a TabContents for this.
   // params.source_contents = source;
   params.disposition = disposition;
   params.window_bounds = initial_pos;
   params.window_action = chrome::NavigateParams::SHOW_WINDOW;
   params.user_gesture = true;
   chrome::Navigate(&params);
 
   return params.browser;
 }
 
 bool WebDialogWebContentsDelegate::IsPopupOrPanel(
     const WebContents* source) const {
   // This needs to return true so that we are allowed to be resized by our
   // contents.
   return true;
 }
 
 bool WebDialogWebContentsDelegate::ShouldAddNavigationToHistory(
     const history::HistoryAddPageArgs& add_page_args,
     content::NavigationType navigation_type) {
   return false;
 }