Honor profile directory when creating new window in existing browser

chrome/browser/process_singleton_linux.cc

 // Copyright (c) 2011 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.
 
 // On Linux, when the user tries to launch a second copy of chrome, we check
 // for a socket in the user's profile directory.  If the socket file is open we
 // send a message to the first chrome browser process with the current
 // directory and second process command line flags.  The second process then
 // exits.
 //
@@ skipping 623 matching lines @@
     // Send back "SHUTDOWN" message, so that the client process can start up
     // without killing this process.
     reader->FinishWithACK(kShutdownToken, arraysize(kShutdownToken) - 1);
     return;
   }
 
   CommandLine parsed_command_line(argv);
   PrefService* prefs = g_browser_process->local_state();
   DCHECK(prefs);
 
-  Profile* profile = ProfileManager::GetLastUsedProfile();
-
-  if (!profile) {
-    // We should only be able to get here if the profile already exists and
-    // has been created.
-    NOTREACHED();
-    return;
-  }
-
   // Ignore the request if the process was passed the --product-version flag.
   // Normally we wouldn't get here if that flag had been passed, but it can
   // happen if it is passed to an older version of chrome. Since newer versions
   // of chrome do this in the background, we want to avoid spawning extra
   // windows.
   if (parsed_command_line.HasSwitch(switches::kProductVersion)) {
     DLOG(WARNING) << "Remote process was passed product version flag, "
                   << "but ignored it. Doing nothing.";
   } else {
     // Run the browser startup sequence again, with the command line of the
     // signalling process.
-    FilePath current_dir_file_path(current_dir);
-    BrowserInit::ProcessCommandLine(parsed_command_line, current_dir_file_path,
-                                    false /* not process startup */, profile,
-                                    NULL);
+    BrowserInit::ProcessCommandLinePostStartup(
+        parsed_command_line, FilePath(current_dir));
   }
 
   // Send back "ACK" message to prevent the client process from starting up.
   reader->FinishWithACK(kACKToken, arraysize(kACKToken) - 1);
 }
 
 void ProcessSingleton::LinuxWatcher::RemoveSocketReader(SocketReader* reader) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(reader);
   readers_.erase(reader);
@@ skipping 326 matching lines @@
                  sock));
 
   return true;
 }
 
 void ProcessSingleton::Cleanup() {
   UnlinkPath(socket_path_);
   UnlinkPath(cookie_path_);
   UnlinkPath(lock_path_);
 }