Rename BrowserInit to StartupBrowserCreator, and move into startup subdir.

chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.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.
 
 // Create a service process that uses a Mock to respond to the browser in order
 // to test launching the browser using the cloud print policy check command
 // line switch.
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/rand_util.h"
 #include "base/test/multiprocess_test.h"
 #include "base/test/test_timeouts.h"
 #include "base/time.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
 #include "chrome/browser/service/service_process_control.h"
-#include "chrome/browser/ui/browser_init.h"
+#include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/service_messages.h"
 #include "chrome/common/service_process_util.h"
 #include "chrome/service/service_ipc_server.h"
 #include "chrome/service/service_process.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
@@ skipping 264 matching lines @@
   // IPC::Channel::Listener implementation
   virtual bool OnMessageReceived(const IPC::Message& message) { return false; }
   virtual void OnChannelConnected(int32 peer_pid);
 
   // MultiProcessTest implementation.
   virtual CommandLine MakeCmdLine(const std::string& procname,
                                   bool debug_on_start) OVERRIDE;
 
   bool LaunchBrowser(const CommandLine& command_line, Profile* profile) {
     int return_code = 0;
-    BrowserInit browser_init;
-    return BrowserInit::ProcessCmdLineImpl(command_line, FilePath(), false,
-                                           profile, BrowserInit::Profiles(),
-                                           &return_code, &browser_init);
+    StartupBrowserCreator browser_creator;
+    return StartupBrowserCreator::ProcessCmdLineImpl(
+        command_line, FilePath(), false, profile,
+        StartupBrowserCreator::Profiles(), &return_code, &browser_creator);
   }
 
  protected:
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   base::Thread io_thread_;
 
   std::string startup_channel_id_;
   scoped_ptr<IPC::ChannelProxy> startup_channel_;
 
@@ skipping 212 matching lines @@
   // No expectations on run_loop being true here; that would be a race
   // condition.
   if (run_loop)
     MessageLoop::current()->Run();
 
   EXPECT_EQ("", prefs->GetString(prefs::kCloudPrintEmail));
 
   ShutdownAndWaitForExitWithTimeout(handle);
   profile_manager.DeleteTestingProfile("StartBrowserWithPolicy");
 }