Extract common per-network proxy configuration functions.

chrome/browser/ui/webui/options/preferences_browsertest.cc

 // 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/ui/webui/options/preferences_browsertest.h"
 
 #include <iostream>
 #include <sstream>
 
 #include "base/json/json_reader.h"
@@ skipping 15 matching lines @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "googleurl/src/gurl.h"
 #include "policy/policy_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_library.h"
-#include "chrome/browser/chromeos/cros/network_library.h"
+#include "base/stringprintf.h"
+#include "chrome/browser/chromeos/net/proxy_config_handler.h"
 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
-#include "chromeos/network/onc/onc_utils.h"
+#include "chromeos/network/network_state.h"
+#include "chromeos/network/network_state_handler.h"
 #endif
 
 using testing::AllOf;
 using testing::AnyNumber;
 using testing::Mock;
 using testing::Property;
 using testing::Return;
 using testing::_;
 
 namespace base {
@@ skipping 655 matching lines @@
 }
 
 class ProxyPreferencesBrowserTest : public PreferencesBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
     scoped_ptr<base::DictionaryValue> proxy_config_dict(
         ProxyConfigDictionary::CreateFixedServers(
             "127.0.0.1:8080",
             "*.google.com, 1.2.3.4:22"));
 
-    std::string proxy_config;
-    base::JSONWriter::Write(proxy_config_dict.get(), &proxy_config);
+    ProxyConfigDictionary proxy_config(proxy_config_dict.get());
 
-    chromeos::Network* network = GetActiveNetwork();
-    network->SetProxyConfig(proxy_config);
+    const chromeos::NetworkState* network = GetDefaultNetwork();
+    chromeos::proxy_config::SetProxyConfigForNetwork(
+        proxy_config, *network);
 
-    std::string url = chrome::kChromeUIProxySettingsURL;
-    url += "?network=";
-    url += network->service_path();
+    std::string url = base::StringPrintf("%s?network=%s",
+                                         chrome::kChromeUIProxySettingsURL,
+                                         network->path().c_str());
 
     ui_test_utils::NavigateToURL(browser(), GURL(url));
     SetUpPrefs();
   }
 
  protected:
-  chromeos::Network* GetActiveNetwork() {
-    chromeos::NetworkLibrary* network_library =
-        chromeos::CrosLibrary::Get()->GetNetworkLibrary();
-    return const_cast<chromeos::Network*>(network_library->active_network());
+  const chromeos::NetworkState* GetDefaultNetwork() {
+    return chromeos::NetworkHandler::Get()->network_state_handler()->
+        DefaultNetwork();
   }
 
   void SetProxyPref(const std::string& name, const base::Value& value) {
     std::string type;
     switch (value.GetType()) {
       case base::Value::TYPE_BOOLEAN:
         type = "Boolean";
         break;
       case base::Value::TYPE_INTEGER:
         type = "Integer";
         break;
       case base::Value::TYPE_STRING:
         type = "String";
         break;
       default:
         ASSERT_TRUE(false);
     }
 
     std::string observed_json;
     SetPref(name, type, &value, true, &observed_json);
   }
 
   void VerifyCurrentProxyServer(const std::string& expected_server) {
-    scoped_ptr<base::DictionaryValue> proxy_config =
-        chromeos::onc::ReadDictionaryFromJson(
-            GetActiveNetwork()->proxy_config());
-
-    ProxyConfigDictionary proxy_dict(proxy_config.get());
+    scoped_ptr<ProxyConfigDictionary> proxy_dict(
+        chromeos::proxy_config::GetProxyConfigForNetwork(*GetDefaultNetwork()));
     std::string actual_proxy_server;
-    EXPECT_TRUE(proxy_dict.GetProxyServer(&actual_proxy_server));
+    EXPECT_TRUE(proxy_dict->GetProxyServer(&actual_proxy_server));
     EXPECT_EQ(expected_server, actual_proxy_server);
   }
 };
 
 // Verifies that proxy settings are correctly pushed to JavaScript during
 // initialization of the proxy settings page.
 IN_PROC_BROWSER_TEST_F(ProxyPreferencesBrowserTest,
                        ChromeOSInitializeProxy) {
   // Boolean pref.
   pref_names_.push_back(chromeos::kProxySingle);
@@ skipping 53 matching lines @@
   SetProxyPref(chromeos::kProxyHttpPort, base::FundamentalValue(1));
   SetProxyPref(chromeos::kProxyHttpsPort, base::FundamentalValue(2));
   SetProxyPref(chromeos::kProxyFtpPort, base::FundamentalValue(3));
   SetProxyPref(chromeos::kProxySocksPort, base::FundamentalValue(4));
 
   VerifyCurrentProxyServer(
       "http=a.com:1;https=4.3.2.1:2;ftp=c.com:3;socks=socks4://d.com:4");
 }
 
 #endif