Remove "2" suffixes from options2 code.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
@@ skipping 294 matching lines @@
  private:
   int value_;
 };
 
 ContentSettingsHandler::CachedPepperFlashSettings::CachedPepperFlashSettings()
     : default_permission(PP_FLASH_BROWSEROPERATIONS_PERMISSION_BLOCK),
       initialized(false),
       last_refresh_request_id(0) {
 }
 
-ContentSettingsHandler::CachedPepperFlashSettings::~CachedPepperFlashSettings() {
+ContentSettingsHandler::CachedPepperFlashSettings::~CachedPepperFlashSettings()
+    {
 }
 
 struct ContentSettingsHandler::ExContentSettingsTypeNameEntry {
   int type;
   const char* name;
 };
 
 const ContentSettingsHandler::ExContentSettingsTypeNameEntry
     ContentSettingsHandler::kExContentSettingsTypeGroupNames[] = {
   {CONTENT_SETTINGS_TYPE_COOKIES, "cookies"},
@@ skipping 997 matching lines @@
   for (size_t i = 0; i < arraysize(kExContentSettingsTypeGroupNames); ++i) {
     if (type == kExContentSettingsTypeGroupNames[i].type)
       return kExContentSettingsTypeGroupNames[i].name;
   }
 
   NOTREACHED();
   return std::string();
 }
 
 }  // namespace options2