Fix windows build with disable_nacl=1

chrome/common/chrome_paths_win.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/common/chrome_paths_internal.h"
 
 #include <windows.h>
 #include <knownfolders.h>
 #include <shellapi.h>
 #include <shlobj.h>
@@ skipping 97 matching lines @@
 }
 
 bool GetUserVideosDirectory(base::FilePath* result) {
   return GetUserDirectory(CSIDL_MYVIDEO, result);
 }
 
 bool ProcessNeedsProfileDir(const std::string& process_type) {
   // On windows we don't want subprocesses other than the browser process and
   // service processes to be able to use the profile directory because if it
   // lies on a network share the sandbox will prevent us from accessing it.
-  return process_type.empty() ||
-         process_type == switches::kServiceProcess ||
-         process_type == switches::kNaClBrokerProcess ||
-         process_type == switches::kNaClLoaderProcess;
+
+  if (process_type.empty() || process_type == switches::kServiceProcess)
+    return true;
+
+#if !defined(DISABLE_NACL)
+  if (process_type == switches::kNaClBrokerProcess ||
+      process_type == switches::kNaClLoaderProcess)

[ukai, 2013/12/03 08:04:46]

nit: if (...) {
  return true;
}

for multiline if?

+    return true;
+#endif
+
+  return false;
 }
 
 }  // namespace chrome