Move some message files and hi_res_timer_manager to content, in preparation f...

chrome/nacl/nacl_main.cc

 // Copyright (c) 2010 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/common/sandbox_policy.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "chrome/nacl/nacl_thread.h"
 #include "content/common/child_process.h"
+#include "content/common/hi_res_timer_manager.h"
 #include "content/common/main_function_params.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
 #include "chrome/nacl/broker_thread.h"
 #include "chrome/test/injection_test_dll.h"
 #include "sandbox/src/sandbox.h"
 #endif
 
 #ifdef _WIN64
@@ skipping 96 matching lines @@
     // require waiting for a timeout.
     VLOG(1) << "Sandbox test failed: Not launching NaCl process";
   }
 #else
   NOTIMPLEMENTED() << " not implemented startup, plugin startup dialog etc.";
 #endif
 
   platform.PlatformUninitialize();
   return 0;
 }