Ensure we have a valid profile when using

BrowserInit::LaunchWithProfile::OpenURLsInBrowser() directly and the browser
passed in is a popup window.

Original Review URL: http://codereview.chromium.org/160331

BUG=http://crbug.com/17520
TEST=see bug.

Review URL: http://codereview.chromium.org/164341

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23077 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index acab527..9ca8f12 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -377,6 +377,7 @@ BrowserInit::LaunchWithProfile::LaunchWithProfile(
     const CommandLine& command_line)
         : cur_dir_(cur_dir),
           command_line_(command_line),
+          profile_(NULL),
           browser_init_(NULL) {
 }
 
@@ -386,6 +387,7 @@ BrowserInit::LaunchWithProfile::LaunchWithProfile(
     BrowserInit* browser_init)
         : cur_dir_(cur_dir),
           command_line_(command_line),
+          profile_(NULL),
           browser_init_(browser_init) {
 }
 
@@ -554,6 +556,12 @@ Browser* BrowserInit::LaunchWithProfile::OpenURLsInBrowser(
     bool process_startup,
     const std::vector<GURL>& urls) {
   DCHECK(!urls.empty());
+  // If we don't yet have a profile, try to use the one we're given from
+  // |browser|. While we may not end up actually using |browser| (since it
+  // could be a popup window), we can at least use the profile.
+  if (!profile_ && browser)
+    profile_ = browser->profile();
+
   int pin_count = 0;
   if (!browser) {
     std::wstring pin_count_string =