Remove "2" suffixes from options2 code.

chrome/browser/ui/webui/options2/content_settings_handler.cc

Index: chrome/browser/ui/webui/options2/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options2/content_settings_handler2.cc b/chrome/browser/ui/webui/options2/content_settings_handler.cc
similarity index 99%
rename from chrome/browser/ui/webui/options2/content_settings_handler2.cc
rename to chrome/browser/ui/webui/options2/content_settings_handler.cc
index 30c26118b7e870f3e385629d09b42a1616d9083b..cbcdb80dbf36f70f17d7603cf934da43b3a6b9aa 100644
--- a/chrome/browser/ui/webui/options2/content_settings_handler2.cc
+++ b/chrome/browser/ui/webui/options2/content_settings_handler.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/ui/webui/options2/content_settings_handler2.h"
+#include "chrome/browser/ui/webui/options2/content_settings_handler.h"
 
 #include <vector>
 
@@ -317,7 +317,8 @@ ContentSettingsHandler::CachedPepperFlashSettings::CachedPepperFlashSettings()
       last_refresh_request_id(0) {
 }
 
-ContentSettingsHandler::CachedPepperFlashSettings::~CachedPepperFlashSettings() {
+ContentSettingsHandler::CachedPepperFlashSettings::~CachedPepperFlashSettings()
+    {
 }
 
 struct ContentSettingsHandler::ExContentSettingsTypeNameEntry {