FBTF: Remove unneeded headers from base/ (part 7)

base/scoped_variant_win.h

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
 #ifndef BASE_SCOPED_VARIANT_WIN_H_
 #define BASE_SCOPED_VARIANT_WIN_H_
 #pragma once
 
 #include <windows.h>
 #include <oleauto.h>
 
-#include "base/basictypes.h"  // needed to pick up OS_WIN
-#include "base/logging.h"
+#include "base/basictypes.h"
+#include "build/build_config.h"
 
 // Scoped VARIANT class for automatically freeing a COM VARIANT at the
 // end of a scope.  Additionally provides a few functions to make the
 // encapsulated VARIANT easier to use.
 // Instead of inheriting from VARIANT, we take the containment approach
 // in order to have more control over the usage of the variant and guard
 // against memory leaks.
 class ScopedVariant {
  public:
   // Declaration of a global variant variable that's always VT_EMPTY
@@ skipping 128 matching lines @@
 
  private:
   // Comparison operators for ScopedVariant are not supported at this point.
   // Use the Compare method instead.
   bool operator==(const ScopedVariant& var) const;
   bool operator!=(const ScopedVariant& var) const;
   DISALLOW_COPY_AND_ASSIGN(ScopedVariant);
 };
 
 #endif  // BASE_SCOPED_VARIANT_WIN_H_