Move content_restriction.h and main_function_params.h to content/public/common, and put them in t...

chrome/nacl/nacl_main_platform_delegate_mac.mm

 // 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"
 
 #import <Cocoa/Cocoa.h>
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/native_library.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/common/sandbox_mac.h"
 #include "content/public/common/sandbox_init.h"
 
 NaClMainPlatformDelegate::NaClMainPlatformDelegate(
-    const MainFunctionParams& parameters)
+    const content::MainFunctionParams& parameters)
     : parameters_(parameters), sandbox_test_module_(NULL) {
 }
 
 NaClMainPlatformDelegate::~NaClMainPlatformDelegate() {
 }
 
 // TODO(jvoung): see if this old comment (from renderer_main_platform...)
 // is relevant to the nacl loader.
 // TODO(mac-port): Any code needed to initialize a process for purposes of
 // running a NaClLoader needs to also be reflected in chrome_main.cc for
@@ skipping 44 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;
 }