Store Proxy Servers as proxy servers and not GURLs.

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

 // Copyright 2013 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/net/spdyproxy/data_reduction_proxy_settings_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/base64.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_test_utils.h"
+#include "net/proxy/proxy_server.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using testing::_;
 using testing::AnyNumber;
 using testing::Return;
 
-const char kDataReductionProxyDev[] = "http://foo-dev.com:80";
+const char kDataReductionProxyDev[] = "foo-dev.com:80";
 
 using data_reduction_proxy::DataReductionProxySettings;
 
 // Used for testing the DataReductionProxySettingsAndroid class.
 class TestDataReductionProxySettingsAndroid
     : public DataReductionProxySettingsAndroid {
  public:
   // Constructs an Android settings object for test that wraps the provided
   // settings object.
   explicit TestDataReductionProxySettingsAndroid(
@@ skipping 112 matching lines @@
   scoped_ptr<DataReductionProxySettingsAndroid> settings_android_;
   JNIEnv* env_;
 };
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestGetDataReductionProxyOrigin) {
   // SetUp() adds the origin to the command line, which should be returned here.
   ScopedJavaLocalRef<jstring> result =
       SettingsAndroid()->GetDataReductionProxyOrigin(env_, NULL);
   ASSERT_TRUE(result.obj());
   const base::android::JavaRef<jstring>& str_ref = result;
-  EXPECT_EQ(GURL(expected_params_->DefaultOrigin()),
-            GURL(ConvertJavaStringToUTF8(str_ref)));
+  EXPECT_EQ(expected_params_->DefaultOrigin(),
+            ConvertJavaStringToUTF8(str_ref));
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest,
        TestGetDataReductionProxyDevOrigin) {
   base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       data_reduction_proxy::switches::kDataReductionProxyDev,
       kDataReductionProxyDev);
   ResetSettings(true, true, false, true, false);
   ResetSettingsAndroid();
   ScopedJavaLocalRef<jstring> result =
       SettingsAndroid()->GetDataReductionProxyOrigin(env_, NULL);
   ASSERT_TRUE(result.obj());
   const base::android::JavaRef<jstring>& str_ref = result;
-  EXPECT_EQ(GURL(kDataReductionProxyDev),
-            GURL(ConvertJavaStringToUTF8(str_ref)));
+  EXPECT_EQ(kDataReductionProxyDev,
+            ConvertJavaStringToUTF8(str_ref));
 }
 
 TEST_F(DataReductionProxySettingsAndroidTest, TestGetDailyContentLengths) {
   ScopedJavaLocalRef<jlongArray> result =
       SettingsAndroid()->GetDailyContentLengths(
           env_, data_reduction_proxy::prefs::kDailyHttpOriginalContentLength);
   ASSERT_TRUE(result.obj());
 
   jsize java_array_len = env_->GetArrayLength(result.obj());
   ASSERT_EQ(static_cast<jsize>(data_reduction_proxy::kNumDaysInHistory),
             java_array_len);
 
   jlong value;
   for (size_t i = 0; i < data_reduction_proxy::kNumDaysInHistory; ++i) {
     env_->GetLongArrayRegion(result.obj(), i, 1, &value);
     ASSERT_EQ(
         static_cast<long>(
             (data_reduction_proxy::kNumDaysInHistory - 1 - i) * 2), value);
   }
 }