Don't pass the connector check policy flag along.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1497 matching lines @@
 
   // If the command line specifies --pack-extension, attempt the pack extension
   // startup action and exit.
   if (parsed_command_line().HasSwitch(switches::kPackExtension)) {
     ExtensionsStartupUtil extension_startup_util;
     if (extension_startup_util.PackExtension(parsed_command_line()))
       return content::RESULT_CODE_NORMAL_EXIT;
     return chrome::RESULT_CODE_PACK_EXTENSION_ERROR;
   }
 
+  bool pass_command_line =

[Paweł Hajdan Jr., 2012/06/23 07:23:37]

This #ifdef-mixed assignment is ugly. Please find a prettier way, e.g.

bool pass_command_line = true;

#if !defined(OS_MACOSX)
pass_command_line = !HasImportSwitch(...);
#endif

pass_command_line = pass_command_line && ...

 #if !defined(OS_MACOSX)

[Albert Bodenhamer, 2012/06/27 16:35:33]

This is a bit hard to parse.  perhaps something like:
bool pass_command_line = !parsed_command_line().HasSwitch();
#if <blah>
pass_command_line = pass_command_line && !HasImportSwitch()
#endif

   // In environments other than Mac OS X we support import of settings
   // from other browsers. In case this process is a short-lived "import"
   // process that another browser runs just to import the settings, we
   // don't want to be checking for another browser process, by design.
-  if (!HasImportSwitch(parsed_command_line())) {
+      !HasImportSwitch(parsed_command_line()) &&
 #endif
+      // If we're being launched just to check the connector policy, we are
+      // short-lived and don't want to be passing that switch off.
+      !parsed_command_line().HasSwitch(
+          switches::kCheckCloudPrintConnectorPolicy);
+
+  if (pass_command_line) {
     // When another process is running, use that process instead of starting a
     // new one. NotifyOtherProcess will currently give the other process up to
     // 20 seconds to respond. Note that this needs to be done before we attempt
     // to read the profile.
     notify_result_ = process_singleton_->NotifyOtherProcessOrCreate(
         base::Bind(&ProcessSingletonNotificationCallback));
     switch (notify_result_) {
       case ProcessSingleton::PROCESS_NONE:
         // No process already running, fall through to starting a new one.
         break;
@@ skipping 12 matching lines @@
         LOG(ERROR) << "Failed to create a ProcessSingleton for your profile "
                       "directory. This means that running multiple instances "
                       "would start multiple browser processes rather than "
                       "opening a new window in the existing process. Aborting "
                       "now to avoid profile corruption.";
         return chrome::RESULT_CODE_PROFILE_IN_USE;
 
       default:
         NOTREACHED();
     }
-#if !defined(OS_MACOSX)  // closing brace for if
   }
-#endif
 
 #if defined(USE_X11)
   SetBrowserX11ErrorHandlers();
 #endif
 
   // Desktop construction occurs here, (required before profile creation).
   PreProfileInit();
 
   // Profile creation ----------------------------------------------------------
 
@@ skipping 389 matching lines @@
   // otherwise it will be done by the destructor in a wrong thread.
   if (parameters().ui_task == NULL && translate_manager_ != NULL)
     translate_manager_->CleanupPendingUlrFetcher();
 
   if (notify_result_ == ProcessSingleton::PROCESS_NONE)
     process_singleton_->Cleanup();
 
   // Stop all tasks that might run on WatchDogThread.
   ThreadWatcherList::StopWatchingAll();
 
-  browser_process_->metrics_service()->Stop();
+  if (browser_process_->metrics_service())
+    browser_process_->metrics_service()->Stop();
 
   restart_last_session_ = browser_shutdown::ShutdownPreThreadsStop();
   browser_process_->StartTearDown();
 }
 
 void ChromeBrowserMainParts::PostDestroyThreads() {
   browser_process_->PostDestroyThreads();
   // browser_shutdown takes care of deleting browser_process, so we need to
   // release it.
   ignore_result(browser_process_.release());
@@ skipping 55 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead_";
     uma_name += pre_read_percentage;
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }