Remove "2" suffixes from options2 code.

chrome/browser/ui/webui/options2/cookies_view_handler2.h

Index: chrome/browser/ui/webui/options2/cookies_view_handler2.h
diff --git a/chrome/browser/ui/webui/options2/cookies_view_handler2.h b/chrome/browser/ui/webui/options2/cookies_view_handler2.h
deleted file mode 100644
index fe36cc5e098b1701f66ffd7773c395ba06bbba29..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/webui/options2/cookies_view_handler2.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// 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.
-
-#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER2_H_
-#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER2_H_
-#pragma once
-
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/cookies_tree_model.h"
-#include "chrome/browser/ui/webui/options2/options_ui2.h"
-
-class CookiesTreeModelUtil;
-
-namespace options2 {
-
-class CookiesViewHandler : public OptionsPageUIHandler,
-                           public CookiesTreeModel::Observer {
- public:
-  CookiesViewHandler();
-  virtual ~CookiesViewHandler();
-
-  // OptionsPageUIHandler implementation.
-  virtual void GetLocalizedValues(
-      base::DictionaryValue* localized_strings) OVERRIDE;
-  virtual void RegisterMessages() OVERRIDE;
-
-  // CookiesTreeModel::Observer implementation.
-  virtual void TreeNodesAdded(ui::TreeModel* model,
-                              ui::TreeModelNode* parent,
-                              int start,
-                              int count) OVERRIDE;
-  virtual void TreeNodesRemoved(ui::TreeModel* model,
-                                ui::TreeModelNode* parent,
-                                int start,
-                                int count) OVERRIDE;
-  virtual void TreeNodeChanged(ui::TreeModel* model,
-                               ui::TreeModelNode* node) OVERRIDE {}
-  virtual void TreeModelBeginBatch(CookiesTreeModel* model) OVERRIDE;
-  virtual void TreeModelEndBatch(CookiesTreeModel* model) OVERRIDE;
-
- private:
-  // Creates the CookiesTreeModel if neccessary.
-  void EnsureCookiesTreeModelCreated();
-
-  // Updates search filter for cookies tree model.
-  void UpdateSearchResults(const base::ListValue* args);
-
-  // Remove all sites data.
-  void RemoveAll(const base::ListValue* args);
-
-  // Remove selected sites data.
-  void Remove(const base::ListValue* args);
-
-  // Get the tree node using the tree path info in |args| and call
-  // SendChildren to pass back children nodes data to WebUI.
-  void LoadChildren(const base::ListValue* args);
-
-  // Get children nodes data and pass it to 'CookiesView.loadChildren' to
-  // update the WebUI.
-  void SendChildren(const CookieTreeNode* parent);
-
-  // The Cookies Tree model
-  scoped_ptr<CookiesTreeModel> cookies_tree_model_;
-
-  // Flag to indicate whether there is a batch update in progress.
-  bool batch_update_;
-
-  scoped_ptr<CookiesTreeModelUtil> model_util_;
-
-  DISALLOW_COPY_AND_ASSIGN(CookiesViewHandler);
-};
-
-}  // namespace options2
-
-#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER2_H_