Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(196)

Unified Diff: chrome/browser/prefs/proxy_prefs_unittest.cc

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/prefs/proxy_prefs.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
deleted file mode 100644
index 63b8ea333d199c8486c2d6af22ad18ba21dd6179..0000000000000000000000000000000000000000
--- a/chrome/browser/prefs/proxy_prefs_unittest.cc
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2011 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/values.h"
-#include "chrome/browser/prefs/proxy_prefs.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-TEST(ProxyPrefsTest, StringToProxyMode) {
- ProxyPrefs::ProxyMode mode;
- EXPECT_TRUE(ProxyPrefs::StringToProxyMode("direct", &mode));
- EXPECT_EQ(ProxyPrefs::MODE_DIRECT, mode);
- EXPECT_TRUE(ProxyPrefs::StringToProxyMode("auto_detect", &mode));
- EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT, mode);
- EXPECT_TRUE(ProxyPrefs::StringToProxyMode("pac_script", &mode));
- EXPECT_EQ(ProxyPrefs::MODE_PAC_SCRIPT, mode);
- EXPECT_TRUE(ProxyPrefs::StringToProxyMode("system", &mode));
- EXPECT_EQ(ProxyPrefs::MODE_SYSTEM, mode);
- EXPECT_TRUE(ProxyPrefs::StringToProxyMode("fixed_servers", &mode));
- EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS, mode);
-
- EXPECT_FALSE(ProxyPrefs::StringToProxyMode("monkey", &mode));
-}
-
-TEST(ProxyPrefsTest, IntToProxyMode) {
- ASSERT_EQ(ProxyPrefs::MODE_DIRECT, 0);
- ASSERT_EQ(ProxyPrefs::MODE_AUTO_DETECT, 1);
- ASSERT_EQ(ProxyPrefs::MODE_PAC_SCRIPT, 2);
- ASSERT_EQ(ProxyPrefs::MODE_FIXED_SERVERS, 3);
- ASSERT_EQ(ProxyPrefs::MODE_SYSTEM, 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::MODE_DIRECT, mode);
- EXPECT_TRUE(ProxyPrefs::IntToProxyMode(1, &mode));
- EXPECT_EQ(ProxyPrefs::MODE_AUTO_DETECT, mode);
- EXPECT_TRUE(ProxyPrefs::IntToProxyMode(2, &mode));
- EXPECT_EQ(ProxyPrefs::MODE_PAC_SCRIPT, mode);
- EXPECT_TRUE(ProxyPrefs::IntToProxyMode(3, &mode));
- EXPECT_EQ(ProxyPrefs::MODE_FIXED_SERVERS, mode);
- EXPECT_TRUE(ProxyPrefs::IntToProxyMode(4, &mode));
- EXPECT_EQ(ProxyPrefs::MODE_SYSTEM, mode);
-
- EXPECT_FALSE(ProxyPrefs::IntToProxyMode(-1, &mode));
- EXPECT_FALSE(ProxyPrefs::IntToProxyMode(ProxyPrefs::kModeCount, &mode));
-}
« no previous file with comments | « chrome/browser/prefs/proxy_prefs.cc ('k') | chrome/browser/profiles/off_the_record_profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698