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

Unified Diff: chrome/browser/chromeos/net/onc_utils_unittest.cc

Issue 1228543002: Translate ONC ProxySettings <-> Shill ProxyConfig (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add SchemeToString Created 5 years, 5 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
Index: chrome/browser/chromeos/net/onc_utils_unittest.cc
diff --git a/chrome/browser/chromeos/net/onc_utils_unittest.cc b/chrome/browser/chromeos/net/onc_utils_unittest.cc
deleted file mode 100644
index 514a3fac5027f60b9d20486e82915b112f2f517f..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/net/onc_utils_unittest.cc
+++ /dev/null
@@ -1,48 +0,0 @@
-// 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.
-
-#include "chrome/browser/chromeos/net/onc_utils.h"
-
-#include <string>
-
-#include "base/strings/string_number_conversions.h"
-#include "base/values.h"
-#include "chromeos/network/network_ui_data.h"
-#include "chromeos/network/onc/onc_test_utils.h"
-#include "google_apis/drive/test_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chromeos {
-namespace onc {
-
-TEST(ONCUtils, ProxySettingsToProxyConfig) {
- scoped_ptr<base::Value> test_data =
- google_apis::test_util::LoadJSONFile("chromeos/net/proxy_config.json");
-
- base::ListValue* list_of_tests;
- test_data->GetAsList(&list_of_tests);
-
- int index = 0;
- for (base::ListValue::iterator it = list_of_tests->begin();
- it != list_of_tests->end(); ++it, ++index) {
- SCOPED_TRACE("Test case #" + base::IntToString(index));
-
- base::DictionaryValue* test_case;
- (*it)->GetAsDictionary(&test_case);
-
- base::DictionaryValue* onc_proxy_settings;
- test_case->GetDictionary("ONC_ProxySettings", &onc_proxy_settings);
-
- base::DictionaryValue* expected_proxy_config;
- test_case->GetDictionary("ProxyConfig", &expected_proxy_config);
-
- scoped_ptr<base::DictionaryValue> actual_proxy_config =
- ConvertOncProxySettingsToProxyConfig(*onc_proxy_settings);
- EXPECT_TRUE(test_utils::Equals(expected_proxy_config,
- actual_proxy_config.get()));
- }
-}
-
-} // namespace onc
-} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698