Merge 74514 - Use a struct instead of a union for SandboxInterfaceInfo...

chrome/app/client_util.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-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.
 
 // This file defines utility functions that can report details about the
 // host operating environment.
 
 #ifndef CHROME_APP_CLIENT_UTIL_H_
 #define CHROME_APP_CLIENT_UTIL_H_
 #pragma once
 
 #include <windows.h>
 #include <string>
 
 namespace sandbox {
-  union SandboxInterfaceInfo;
+  struct SandboxInterfaceInfo;
 }
 
 // Implements the common aspects of loading chrome.dll for both chrome and
 // chromium scenarios, which are in charge of implementing two abstract
 // methods: GetRegistryPath() and OnBeforeLaunch().
 class MainDllLoader {
  public:
   MainDllLoader();
   virtual ~MainDllLoader();
 
@@ skipping 26 matching lines @@
  private:
   // Chrome.dll handle.
   HMODULE dll_;
 };
 
 // Factory for the MainDllLoader. Caller owns the pointer and should call
 // delete to free it.
 MainDllLoader* MakeMainDllLoader();
 
 #endif  // CHROME_APP_CLIENT_UTIL_H_