Revert of Cache IsNonBrowserProcess values, so we only take a loader-lock the first time.

chrome_elf/chrome_elf_util.cc

 // Copyright 2014 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_elf/chrome_elf_util.h"
 
-#include <assert.h>
 #include <windows.h>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 
-ProcessType g_process_type = ProcessType::UNINITIALIZED;
-
 namespace {
 
 const wchar_t kRegPathClientState[] = L"Software\\Google\\Update\\ClientState";
 const wchar_t kRegPathClientStateMedium[] =
     L"Software\\Google\\Update\\ClientStateMedium";
 #if defined(GOOGLE_CHROME_BUILD)
 const wchar_t kRegPathChromePolicy[] = L"SOFTWARE\\Policies\\Google\\Chrome";
 #else
 const wchar_t kRegPathChromePolicy[] = L"SOFTWARE\\Policies\\Chromium";
 #endif  // defined(GOOGLE_CHROME_BUILD)
@@ skipping 163 matching lines @@
                           value_bytes, &size) == ERROR_SUCCESS) {
       *breakpad_enabled = value != 0;
     }
     ::RegCloseKey(key);
     return size == sizeof(value);
   }
 
   return false;
 }
 
-void InitializeProcessType() {
-  assert(g_process_type == UNINITIALIZED);
+bool IsNonBrowserProcess() {
   typedef bool (*IsSandboxedProcessFunc)();
   IsSandboxedProcessFunc is_sandboxed_process_func =
       reinterpret_cast<IsSandboxedProcessFunc>(
           GetProcAddress(GetModuleHandle(NULL), "IsSandboxedProcess"));
-  if (is_sandboxed_process_func && is_sandboxed_process_func()) {
-    g_process_type = NON_BROWSER_PROCESS;
-    return;
-  }
+  bool is_sandboxed_process =
+      is_sandboxed_process_func && is_sandboxed_process_func();
 
-  const wchar_t* command_line = GetCommandLine();
-  if (command_line && wcsstr(command_line, L"--type")) {
-    g_process_type = NON_BROWSER_PROCESS;
-    return;
-  }
+  // TODO(robertshield): Drop the command line check when we drop support for
+  // enabling chrome_elf in unsandboxed processes.
+  wchar_t* command_line = GetCommandLine();
+  bool has_process_type_flag = command_line && wcsstr(command_line, L"--type");
 
-  g_process_type = BROWSER_PROCESS;
+  return (has_process_type_flag || is_sandboxed_process);
 }
-
-bool IsNonBrowserProcess() {
-  assert(g_process_type != UNINITIALIZED);
-  return g_process_type == NON_BROWSER_PROCESS;
-}