Revert "Implement OS X Encoding Menu."

This reverts commit r16061.

TBR=jeremy

Review URL: http://codereview.chromium.org/115357


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16065 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 92 deletions

diff --git a/chrome/browser/encoding_menu_controller_unittest.cc b/chrome/browser/encoding_menu_controller_unittest.cc
deleted file mode 100644
index a8258bd6..0000000
--- a/chrome/browser/encoding_menu_controller_unittest.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2009 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/encoding_menu_controller.h"
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "chrome/app/chrome_dll_resource.h"
-#include "chrome/browser/profile.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/test/testing_profile.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-
-class EncodingMenuControllerTest : public testing::Test {
-};
-
-TEST_F(EncodingMenuControllerTest, EncodingIDsBelongTest) {
-  EncodingMenuController controller;
-
-  // Check some bogus ids to make sure they're never valid.
-  ASSERT_FALSE(controller.DoesCommandBelongToEncodingMenu(0));
-  ASSERT_FALSE(controller.DoesCommandBelongToEncodingMenu(-1));
-
-  int num_valid_encoding_ids = controller.NumValidGUIEncodingIDs();
-  const int* valid_encodings = controller.ValidGUIEncodingIDs();
-  ASSERT_TRUE(controller.DoesCommandBelongToEncodingMenu(
-      IDC_ENCODING_AUTO_DETECT));
-  // Check that all valid encodings are accepted.
-  for (int i = 0; i < num_valid_encoding_ids; ++i) {
-    ASSERT_TRUE(controller.DoesCommandBelongToEncodingMenu(valid_encodings[i]));
-  }
-
-  // This test asserts that we haven't added a new valid ID without including it
-  // in the kValidEncodingIds test list above.
-  // The premise is that new encodings will be added directly after the current
-  // ones so we'll catch such cases.
-  int one_past_largest_id = valid_encodings[num_valid_encoding_ids - 1] + 1;
-  ASSERT_FALSE(controller.DoesCommandBelongToEncodingMenu(one_past_largest_id));
-}
-
-TEST_F(EncodingMenuControllerTest, ListEncodingMenuItems) {
-  typedef EncodingMenuController::EncodingMenuItemList EncodingMenuItemList;
-  EncodingMenuController controller;
-
-  EncodingMenuItemList english_items;
-  TestingProfile profile_en;
-
-  controller.GetEncodingMenuItems(&profile_en, &english_items);
-
-  // Make sure there are items in the lists.
-  ASSERT_TRUE(english_items.size() > 0);
-  // Make sure that autodetect is the first item on both menus
-  ASSERT_EQ(english_items[0].first, IDC_ENCODING_AUTO_DETECT);
-}
-
-TEST_F(EncodingMenuControllerTest, IsItemChecked) {
-  TestingProfile profile_en;
-  std::wstring encoding(L"UTF-8");
-
-  // Check that enabling and disabling autodetect works.
-  bool autodetect_enabed[] = {true, false};
-  PrefService* prefs = profile_en.GetPrefs();
-  EncodingMenuController controller;
-  for (size_t i = 0; i < arraysize(autodetect_enabed); ++i) {
-    bool enabled = autodetect_enabed[i];
-    prefs->SetBoolean(prefs::kWebKitUsesUniversalDetector, enabled);
-    ASSERT_TRUE(controller.IsItemChecked(&profile_en,
-                                         encoding,
-                                         IDC_ENCODING_AUTO_DETECT) == enabled);
-  }
-
-  // Check all valid encodings, make sure only one is enabled when autodetection
-  // is turned off.
-  prefs->SetBoolean(prefs::kWebKitUsesUniversalDetector, false);
-  bool encoding_is_enabled = false;
-  size_t num_valid_encoding_ids = controller.NumValidGUIEncodingIDs();
-  const int* valid_encodings = controller.ValidGUIEncodingIDs();
-  for (size_t i = 0; i < num_valid_encoding_ids; ++i) {
-    bool on = controller.IsItemChecked(&profile_en,
-                                       encoding,
-                                       valid_encodings[i]);
-    // Only one item in the encoding menu can be selected at a time.
-    ASSERT_FALSE(on && encoding_is_enabled);
-    encoding_is_enabled |= on;
-  }
-  
-  // Make sure at least one encoding is enabled.
-  ASSERT_TRUE(encoding_is_enabled);
-}