Move chrome/nacl to components/nacl.

components/nacl/loader/nacl_main_platform_delegate_win.cc

 // Copyright (c) 2011 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/nacl/nacl_main_platform_delegate.h"
+#include "components/nacl/loader/nacl_main_platform_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
-#include "chrome/common/chrome_switches.h"
+#include "components/nacl/common/nacl_switches.h"
 #include "sandbox/win/src/sandbox.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
     const content::MainFunctionParams& parameters)
     : parameters_(parameters), sandbox_test_module_(NULL) {
 }
 
 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
 }
 
 void NaClMainPlatformDelegate::PlatformInitialize() {
   // Be mindful of what resources you acquire here. They can be used by
   // malicious code if the renderer gets compromised.
 }
 
 void NaClMainPlatformDelegate::PlatformUninitialize() {
 }
 
 void NaClMainPlatformDelegate::InitSandboxTests(bool no_sandbox) {
   const CommandLine& command_line = parameters_.command_line;
 
   DVLOG(1) << "Started NaClLdr with " << command_line.GetCommandLineString();
 
   sandbox::TargetServices* target_services =
       parameters_.sandbox_info->target_services;
 
   if (target_services && !no_sandbox) {
-    base::FilePath test_dll_name =
-      command_line.GetSwitchValuePath(switches::kTestNaClSandbox);
+    base::FilePath test_dll_name = command_line.GetSwitchValuePath(

[Mark Seaborn, 2013/06/21 00:00:47]

Please undo this unnecessary formatting change.

+        switches::kTestNaClSandbox);
     if (!test_dll_name.empty()) {
       // At this point, hack on the suffix according to with bitness
       // of your windows process.
 #if defined(_WIN64)
       DVLOG(1) << "Using 64-bit test dll\n";
       test_dll_name = test_dll_name.InsertBeforeExtension(L"64");
       test_dll_name = test_dll_name.ReplaceExtension(L"dll");
 #else
       DVLOG(1) << "Using 32-bit test dll\n";
       test_dll_name = test_dll_name.ReplaceExtension(L"dll");
@@ skipping 34 matching lines @@
       result = (*run_security_tests)();
     } else {
       VLOG(1) << "Failed to get NaCl sandbox test function";
       result = false;
     }
     base::UnloadNativeLibrary(sandbox_test_module_);
     sandbox_test_module_ = NULL;
   }
   return result;
 }