Move a bunch more browser stuff around....

chrome/browser/ui/toolbar/encoding_menu_controller.h

 // Copyright (c) 2010 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_ENCODING_MENU_CONTROLLER_H_
-#define CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_
+#ifndef CHROME_BROWSER_UI_TOOLBAR_ENCODING_MENU_CONTROLLER_H_
+#define CHROME_BROWSER_UI_TOOLBAR_ENCODING_MENU_CONTROLLER_H_
 #pragma once
 
 #include <utility>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"  // For DISALLOW_COPY_AND_ASSIGN
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 
@@ skipping 29 matching lines @@
 
  private:
   // List of all valid encoding GUI IDs.
   static const int kValidEncodingIds[];
   const int* ValidGUIEncodingIDs();
   int NumValidGUIEncodingIDs();
 
   DISALLOW_COPY_AND_ASSIGN(EncodingMenuController);
 };
 
-#endif  // CHROME_BROWSER_ENCODING_MENU_CONTROLLER_H_
+#endif  // CHROME_BROWSER_UI_TOOLBAR_ENCODING_MENU_CONTROLLER_H_