Remove "2" suffixes from options2 code.

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

 // 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_
+#ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER_H_
+#define CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER_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"
+#include "chrome/browser/ui/webui/options2/options_ui.h"
 
 class CookiesTreeModelUtil;
 
 namespace options2 {
 
 class CookiesViewHandler : public OptionsPageUIHandler,
                            public CookiesTreeModel::Observer {
  public:
   CookiesViewHandler();
   virtual ~CookiesViewHandler();
@@ skipping 44 matching lines @@
   // 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_
+#endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS2_COOKIES_VIEW_HANDLER_H_