Introduce a separate preference for 'proxy server mode'

chrome/browser/prefs/proxy_prefs_unittest.cc

Index: chrome/browser/prefs/proxy_prefs_unittest.cc
diff --git a/chrome/browser/prefs/proxy_prefs_unittest.cc b/chrome/browser/prefs/proxy_prefs_unittest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..5c9ffd32e6d3389cb6ac5b5ac8e2f00c1defb0f1
--- /dev/null
+++ b/chrome/browser/prefs/proxy_prefs_unittest.cc
@@ -0,0 +1,55 @@
+// 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.
+
+#include <string>
+
+#include "base/logging.h"
+#include "base/values.h"
+#include "base/version.h"
+#include "chrome/browser/prefs/proxy_prefs.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class ProxyPrefsTest : public testing::Test {

[eroman, 2010/12/23 01:06:15]

I don't think it is necessary to define a test fixture here. I believe you can
delete this class.

And then replace the TEST_F() in this file with TEST().

[battre, 2010/12/23 09:41:42]

Done.

+};
+
+TEST_F(ProxyPrefsTest, StringToProxyMode) {
+  ProxyPrefs::ProxyMode mode;
+  EXPECT_TRUE(ProxyPrefs::StringToProxyMode("direct", &mode));
+  EXPECT_EQ(ProxyPrefs::kModeDirect, mode);
+  EXPECT_TRUE(ProxyPrefs::StringToProxyMode("auto_detect", &mode));
+  EXPECT_EQ(ProxyPrefs::kModeAutoDetect, mode);
+  EXPECT_TRUE(ProxyPrefs::StringToProxyMode("pac_script", &mode));
+  EXPECT_EQ(ProxyPrefs::kModePacScript, mode);
+  EXPECT_TRUE(ProxyPrefs::StringToProxyMode("system", &mode));
+  EXPECT_EQ(ProxyPrefs::kModeSystem, mode);
+  EXPECT_TRUE(ProxyPrefs::StringToProxyMode("fixed_servers", &mode));
+  EXPECT_EQ(ProxyPrefs::kModeFixedServers, mode);
+
+  EXPECT_FALSE(ProxyPrefs::StringToProxyMode("monkey", &mode));
+}
+
+TEST_F(ProxyPrefsTest, IntToProxyMode) {
+  ASSERT_EQ(ProxyPrefs::kModeDirect, 0);
+  ASSERT_EQ(ProxyPrefs::kModeAutoDetect, 1);
+  ASSERT_EQ(ProxyPrefs::kModePacScript, 2);
+  ASSERT_EQ(ProxyPrefs::kModeFixedServers, 3);
+  ASSERT_EQ(ProxyPrefs::kModeSystem, 4);
+  // Update the following as necessary, don't change the previous ones.
+  ASSERT_EQ(ProxyPrefs::kModeCount, 5);
+
+  ProxyPrefs::ProxyMode mode;
+  EXPECT_TRUE(ProxyPrefs::IntToProxyMode(0, &mode));
+  EXPECT_EQ(ProxyPrefs::kModeDirect, mode);
+  EXPECT_TRUE(ProxyPrefs::IntToProxyMode(1, &mode));
+  EXPECT_EQ(ProxyPrefs::kModeAutoDetect, mode);
+  EXPECT_TRUE(ProxyPrefs::IntToProxyMode(2, &mode));
+  EXPECT_EQ(ProxyPrefs::kModePacScript, mode);
+  EXPECT_TRUE(ProxyPrefs::IntToProxyMode(3, &mode));
+  EXPECT_EQ(ProxyPrefs::kModeFixedServers, mode);
+  EXPECT_TRUE(ProxyPrefs::IntToProxyMode(4, &mode));
+  EXPECT_EQ(ProxyPrefs::kModeSystem, mode);
+
+  EXPECT_FALSE(ProxyPrefs::IntToProxyMode(-1, &mode));
+  EXPECT_FALSE(ProxyPrefs::IntToProxyMode(ProxyPrefs::kModeCount, &mode));
+}