OLD | NEW |
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/network_pref_state_observer.h" | 5 #include "chrome/browser/chromeos/net/network_pref_state_observer.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/memory/ptr_util.h" |
10 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
11 #include "chrome/browser/chrome_notification_types.h" | 12 #include "chrome/browser/chrome_notification_types.h" |
12 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" | 13 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h" |
13 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" | 14 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h" |
14 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/test/base/testing_browser_process.h" | 16 #include "chrome/test/base/testing_browser_process.h" |
16 #include "chrome/test/base/testing_profile_manager.h" | 17 #include "chrome/test/base/testing_profile_manager.h" |
17 #include "chromeos/dbus/dbus_thread_manager.h" | 18 #include "chromeos/dbus/dbus_thread_manager.h" |
18 #include "chromeos/network/network_handler.h" | 19 #include "chromeos/network/network_handler.h" |
19 #include "chromeos/network/proxy/ui_proxy_config.h" | 20 #include "chromeos/network/proxy/ui_proxy_config.h" |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
111 profile->GetPrefs()->Set(proxy_config::prefs::kProxy, *proxy_config.get()); | 112 profile->GetPrefs()->Set(proxy_config::prefs::kProxy, *proxy_config.get()); |
112 base::RunLoop().RunUntilIdle(); | 113 base::RunLoop().RunUntilIdle(); |
113 | 114 |
114 // Mode should now be MODE_PAC_SCRIPT. | 115 // Mode should now be MODE_PAC_SCRIPT. |
115 NetworkHandler::Get()->ui_proxy_config_service()->GetProxyConfig( | 116 NetworkHandler::Get()->ui_proxy_config_service()->GetProxyConfig( |
116 kNetworkId, &ui_proxy_config); | 117 kNetworkId, &ui_proxy_config); |
117 EXPECT_EQ(UIProxyConfig::MODE_PAC_SCRIPT, ui_proxy_config.mode); | 118 EXPECT_EQ(UIProxyConfig::MODE_PAC_SCRIPT, ui_proxy_config.mode); |
118 } | 119 } |
119 | 120 |
120 } // namespace chromeos | 121 } // namespace chromeos |
OLD | NEW |