Disable DllRedirectorLoadingTest.TestDllRedirection for component builds.

chrome_frame/test/dll_redirector_loading_test.cc

Index: chrome_frame/test/dll_redirector_loading_test.cc
diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc
index f19cbde4ccd76ceab8333a839bb1e6245c0f6c99..bba490fc2ae2480d140d3a3eb0e950b4da509161 100644
--- a/chrome_frame/test/dll_redirector_loading_test.cc
+++ b/chrome_frame/test/dll_redirector_loading_test.cc
@@ -122,7 +122,16 @@ scoped_ptr<Version> DllRedirectorLoadingTest::original_version_;
 scoped_ptr<Version> DllRedirectorLoadingTest::new_version_;
 ScopedTempDir DllRedirectorLoadingTest::temp_dir_;
 
-TEST_F(DllRedirectorLoadingTest, TestDllRedirection) {
+#if defined(COMPONENT_BUILD)
+// Disabling since npchrome_frame.dll's DllMain can't handle being loaded into
+// a process that has already started services in base.dll such as logging; see
+// http://crbug.com/110492.
+#define MAYBE_TestDllRedirection DISABLED_TestDllRedirection
+#else
+#define MAYBE_TestDllRedirection TestDllRedirection
+#endif
+
+TEST_F(DllRedirectorLoadingTest, MAYBE_TestDllRedirection) {
   struct TestData {
     FilePath first_dll;
     FilePath second_dll;