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

Side by Side Diff: chrome/browser/chromeos/net/onc_utils_unittest.cc

Issue 96413002: Move c/b/google_apis to google_apis/drive. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/net/onc_utils.h" 5 #include "chrome/browser/chromeos/net/onc_utils.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/google_apis/test_util.h"
12 #include "chromeos/network/network_ui_data.h" 11 #include "chromeos/network/network_ui_data.h"
13 #include "chromeos/network/onc/onc_test_utils.h" 12 #include "chromeos/network/onc/onc_test_utils.h"
13 #include "google_apis/drive/test_util.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 namespace onc { 17 namespace onc {
18 18
19 TEST(ONCUtils, ProxySettingsToProxyConfig) { 19 TEST(ONCUtils, ProxySettingsToProxyConfig) {
20 scoped_ptr<base::Value> test_data = 20 scoped_ptr<base::Value> test_data =
21 google_apis::test_util::LoadJSONFile("chromeos/net/proxy_config.json"); 21 google_apis::test_util::LoadJSONFile("chromeos/net/proxy_config.json");
22 22
23 base::ListValue* list_of_tests; 23 base::ListValue* list_of_tests;
(...skipping 15 matching lines...) Expand all
39 39
40 scoped_ptr<base::DictionaryValue> actual_proxy_config = 40 scoped_ptr<base::DictionaryValue> actual_proxy_config =
41 ConvertOncProxySettingsToProxyConfig(*onc_proxy_settings); 41 ConvertOncProxySettingsToProxyConfig(*onc_proxy_settings);
42 EXPECT_TRUE(test_utils::Equals(expected_proxy_config, 42 EXPECT_TRUE(test_utils::Equals(expected_proxy_config,
43 actual_proxy_config.get())); 43 actual_proxy_config.get()));
44 } 44 }
45 } 45 }
46 46
47 } // namespace onc 47 } // namespace onc
48 } // namespace chromeos 48 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/file_manager/open_util.cc ('k') | chrome/browser/drive/drive_api_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698