5 files changed, 8 insertions, 10 deletions
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index 095a1ed..054817b 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -171,7 +171,7 @@
         'test/exception_barrier_unittest.cc',
         'test/html_util_unittests.cc',
         'test/http_negotiate_unittest.cc',
-        'test/module_utils_test.cc',
+        'test/dll_redirector_test.cc',
         'test/policy_settings_unittest.cc',
         'test/simulate_input.h',
         'test/simulate_input.cc',
@@ -733,6 +733,8 @@
         'com_type_info_holder.h',
         'delete_chrome_history.cc',
         'delete_chrome_history.h',
+        'dll_redirector.cc',
+        'dll_redirector.h',
         'exception_barrier.cc',
         'exception_barrier.h',
         'exception_barrier_lowlevel.asm',
@@ -748,8 +750,6 @@
         'in_place_menu.h',
         'metrics_service.cc',
         'metrics_service.h',
-        'module_utils.cc',
-        'module_utils.h',
         'ole_document_impl.h',
         'policy_settings.cc',
         'policy_settings.h',
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index d976e15..a08f2b3 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -26,19 +26,19 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "grit/chrome_frame_resources.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/chrome_active_document.h"
 #include "chrome_frame/chrome_frame_activex.h"
 #include "chrome_frame/chrome_frame_automation.h"
-#include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/chrome_frame_reporting.h"
 #include "chrome_frame/chrome_launcher_utils.h"
 #include "chrome_frame/chrome_protocol.h"
-#include "chrome_frame/module_utils.h"
+#include "chrome_frame/dll_redirector.h"
+#include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/utils.h"
 #include "googleurl/src/url_util.h"
+#include "grit/chrome_frame_resources.h"
 
 using base::win::RegKey;
 
diff --git a/chrome_frame/module_utils.cc b/chrome_frame/dll_redirector.cc
index c6327e8..c6fe8cb 100644
--- a/chrome_frame/module_utils.cc
+++ b/chrome_frame/dll_redirector.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome_frame/module_utils.h"
+#include "chrome_frame/dll_redirector.h"
 
 #include <aclapi.h>
 #include <atlbase.h>
@@ -283,4 +283,3 @@ HMODULE DllRedirector::LoadVersionedModule(Version* version) {
 
   return hmodule;
 }
-
diff --git a/chrome_frame/module_utils.h b/chrome_frame/dll_redirector.h
index be8a89b..be8a89b 100644
--- a/chrome_frame/module_utils.h
+++ b/chrome_frame/dll_redirector.h
diff --git a/chrome_frame/test/module_utils_test.cc b/chrome_frame/test/dll_redirector_test.cc
index 26a0ac7..f052cf4 100644
--- a/chrome_frame/test/module_utils_test.cc
+++ b/chrome_frame/test/dll_redirector_test.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome_frame/module_utils.h"
+#include "chrome_frame/dll_redirector.h"
 
 #include "base/scoped_handle.h"
 #include "base/shared_memory.h"
@@ -400,4 +400,3 @@ TEST_F(DllRedirectorTest, LowIntegrityAccessDenied) {
       shared_memory.Unlock();
   }
 }
-