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

Side by Side Diff: chrome/browser/chromeos/arc/intent_helper/arc_settings_service_browsertest.cc

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Fix DEPS Created 4 years, 1 month 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 <memory> 5 #include <memory>
6 #include <string> 6 #include <string>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/json/json_reader.h" 11 #include "base/json/json_reader.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h" 15 #include "chrome/browser/chromeos/arc/intent_helper/arc_settings_service.h"
16 #include "chrome/browser/chromeos/net/proxy_config_handler.h"
17 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
19 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
20 #include "chromeos/dbus/dbus_thread_manager.h" 19 #include "chromeos/dbus/dbus_thread_manager.h"
21 #include "chromeos/dbus/shill_profile_client.h" 20 #include "chromeos/dbus/shill_profile_client.h"
22 #include "chromeos/dbus/shill_service_client.h" 21 #include "chromeos/dbus/shill_service_client.h"
23 #include "chromeos/network/network_handler.h" 22 #include "chromeos/network/network_handler.h"
24 #include "chromeos/network/network_state.h" 23 #include "chromeos/network/network_state.h"
25 #include "chromeos/network/network_state_handler.h" 24 #include "chromeos/network/network_state_handler.h"
25 #include "chromeos/network/proxy/proxy_config_handler.h"
26 #include "components/arc/arc_service_manager.h" 26 #include "components/arc/arc_service_manager.h"
27 #include "components/arc/test/fake_arc_bridge_service.h" 27 #include "components/arc/test/fake_arc_bridge_service.h"
28 #include "components/arc/test/fake_intent_helper_instance.h" 28 #include "components/arc/test/fake_intent_helper_instance.h"
29 #include "components/policy/core/browser/browser_policy_connector.h" 29 #include "components/policy/core/browser/browser_policy_connector.h"
30 #include "components/policy/core/common/mock_configuration_policy_provider.h" 30 #include "components/policy/core/common/mock_configuration_policy_provider.h"
31 #include "components/policy/core/common/policy_map.h" 31 #include "components/policy/core/common/policy_map.h"
32 #include "components/policy/core/common/policy_types.h" 32 #include "components/policy/core/common/policy_types.h"
33 #include "components/policy/policy_constants.h" 33 #include "components/policy/policy_constants.h"
34 #include "components/prefs/pref_service.h" 34 #include "components/prefs/pref_service.h"
35 #include "components/proxy_config/proxy_config_dictionary.h" 35 #include "components/proxy_config/proxy_config_dictionary.h"
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 ProxyPrefs::kFixedServersProxyModeName); 521 ProxyPrefs::kFixedServersProxyModeName);
522 expected_proxy_config->SetString("host", "proxy-n300"); 522 expected_proxy_config->SetString("host", "proxy-n300");
523 expected_proxy_config->SetInteger("port", 3000); 523 expected_proxy_config->SetInteger("port", 3000);
524 524
525 EXPECT_EQ(CountProxyBroadcasts(fake_intent_helper_instance_->broadcasts(), 525 EXPECT_EQ(CountProxyBroadcasts(fake_intent_helper_instance_->broadcasts(),
526 expected_proxy_config.get()), 526 expected_proxy_config.get()),
527 1); 527 1);
528 } 528 }
529 529
530 } // namespace arc 530 } // namespace arc
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/intent_helper/arc_settings_service.cc ('k') | chrome/browser/chromeos/net/onc_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698