Mechanical refactoring of BrowserProcessImpl::component_updater().

chrome/browser/browser_process_impl.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/browser_process_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 871 matching lines @@
       &BrowserProcessImpl::OnAutoupdateTimer);
 }
 #endif
 
 net_log::ChromeNetLog* BrowserProcessImpl::net_log() {
   return net_log_.get();
 }
 
 component_updater::ComponentUpdateService*
 BrowserProcessImpl::component_updater() {
-  if (!component_updater_.get()) {
-    if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
-      return NULL;
-    scoped_refptr<update_client::Configurator> configurator =
-        component_updater::MakeChromeComponentUpdaterConfigurator(
-            base::CommandLine::ForCurrentProcess(),
-            io_thread()->system_url_request_context_getter(),
-            g_browser_process->local_state());
-    // Creating the component updater does not do anything, components
-    // need to be registered and Start() needs to be called.
-    component_updater_.reset(component_updater::ComponentUpdateServiceFactory(
-                                 configurator).release());
-  }
+  if (component_updater_)
+    return component_updater_.get();
+
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI))

[sky, 2016/09/14 18:11:00]

I'm a bit confused by this check being only in the path that creates
ComponentUpdater. Why is that?

+    return nullptr;
+
+  component_updater_ = component_updater::ComponentUpdateServiceFactory(
+      component_updater::MakeChromeComponentUpdaterConfigurator(
+          base::CommandLine::ForCurrentProcess(),
+          io_thread()->system_url_request_context_getter(),
+          g_browser_process->local_state()));
+
   return component_updater_.get();
 }
 
 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() {
   if (!crl_set_fetcher_)
     crl_set_fetcher_ = new CRLSetFetcher();
   return crl_set_fetcher_.get();
 }
 
 component_updater::PnaclComponentInstaller*
@@ skipping 431 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)