Move scoped_ole_initializer.h to ui/base/win and clean up ole initialization/uninitialization.

chrome/test/base/chrome_test_suite.h

Index: chrome/test/base/chrome_test_suite.h
diff --git a/chrome/test/base/chrome_test_suite.h b/chrome/test/base/chrome_test_suite.h
index 7e30adf3baa4ede7dc8a420d01bbac14b6fd720b..4839e7c708fa295a92235ce5cbb41c62a4f9b847 100644
--- a/chrome/test/base/chrome_test_suite.h
+++ b/chrome/test/base/chrome_test_suite.h
@@ -11,7 +11,10 @@
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/test_suite.h"
-#include "chrome/app/scoped_ole_initializer.h"
+
+#if defined(OS_WIN)
+#include "ui/base/win/scoped_ole_initializer.h"
+#endif
 
 namespace base {
 class StatsTable;
@@ -36,7 +39,9 @@ class ChromeTestSuite : public base::TestSuite {
   std::string stats_filename_;
   scoped_ptr<base::StatsTable> stats_table_;
 
-  ScopedOleInitializer ole_initializer_;
+#if defined(OS_WIN)
+  ui::ScopedOleInitializer ole_initializer_;
+#endif
 };
 
 #endif  // CHROME_TEST_BASE_CHROME_TEST_SUITE_H_