7 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons
index e531153..24e36c9 100644
--- a/chrome/browser/browser.scons
+++ b/chrome/browser/browser.scons
@@ -196,7 +196,7 @@ if env.Bit('windows'):
       'drag_utils.cc',
       'encoding_menu_controller_delegate.cc',
       'encryptor.cc',
-      'extensions/extension_protocol.cc',
+      'extensions/extension_protocols.cc',
       'external_protocol_handler.cc',
       'external_tab_container.cc',
       'fav_icon_helper.cc',
diff --git a/chrome/browser/browser.vcproj b/chrome/browser/browser.vcproj
index a8cab66..811986b 100644
--- a/chrome/browser/browser.vcproj
+++ b/chrome/browser/browser.vcproj
@@ -2246,11 +2246,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\extensions\extension_protocol.cc"
+				RelativePath=".\extensions\extension_protocols.cc"
 				>
 			</File>
 			<File
-				RelativePath=".\extensions\extension_protocol.h"
+				RelativePath=".\extensions\extension_protocols.h"
 				>
 			</File>
 			<File
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index 25cff75..6a5b879 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -46,7 +46,7 @@
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/cert_store.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/extensions/extension_protocol.h"
+#include "chrome/browser/extensions/extension_protocols.h"
 #include "chrome/browser/first_run.h"
 #include "chrome/browser/jankometer.h"
 #include "chrome/browser/metrics_service.h"
diff --git a/chrome/browser/extensions/extension_protocol.cc b/chrome/browser/extensions/extension_protocols.cc
index 6eda9ef..d09cdd1 100644
--- a/chrome/browser/extensions/extension_protocol.cc
+++ b/chrome/browser/extensions/extension_protocols.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/browser/extensions/extension_protocol.h"
+#include "chrome/browser/extensions/extension_protocols.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
diff --git a/chrome/browser/extensions/extension_protocol.h b/chrome/browser/extensions/extension_protocols.h
index 49bda17..80fa654 100644
--- a/chrome/browser/extensions/extension_protocol.h
+++ b/chrome/browser/extensions/extension_protocols.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOL_H_
-#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOL_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_
+#define CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_
 
 #include "base/file_path.h"
 
@@ -16,4 +16,4 @@ FilePath GetPathForExtensionResource(const FilePath& extension_path,
 // Registers support for the extension URL scheme.
 void RegisterExtensionProtocols();
 
-#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOL_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_PROTOCOLS_H_
diff --git a/chrome/browser/extensions/extension_protocol_unittest.cc b/chrome/browser/extensions/extension_protocols_unittest.cc
index 1d2b4f2..113b480 100644
--- a/chrome/browser/extensions/extension_protocol_unittest.cc
+++ b/chrome/browser/extensions/extension_protocols_unittest.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/extensions/extension_protocol.h"
+#include "chrome/browser/extensions/extension_protocols.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-class ExtensionProtocolTest : public testing::Test {
+class ExtensionProtocolsTest : public testing::Test {
 };
 
-TEST(ExtensionProtocolTest, GetPathForExtensionResource) {
+TEST(ExtensionProtocolsTest, GetPathForExtensionResource) {
 #if defined(OS_WIN)
   FilePath extension_path(FILE_PATH_LITERAL("C:\\myextension"));
   EXPECT_EQ(std::wstring(L"C:\\myextension\\foo\\bar.gif"),
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 448a848..f7a6195 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -1058,11 +1058,11 @@
 			Name="TestExtension"
 			>
 			<File
-				RelativePath="..\..\browser\extensions\extension_protocol_unittest.cc"
+				RelativePath="..\..\browser\extensions\extension_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\browser\extensions\extension_unittest.cc"
+				RelativePath="..\..\browser\extensions\extension_protocols_unittest.cc"
 				>
 			</File>
 			<File