Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
index 84ff76d66afcc2168da17bf73c470e53d6b86521..1903e0f030da847ef0ea363a15218a14d3b8b8e7 100644 |
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc |
@@ -22,7 +22,6 @@ using testing::_; |
using testing::AnyNumber; |
using testing::Return; |
-const char kDataReductionProxyOrigin[] = "https://foo.com:443/"; |
const char kDataReductionProxyDev[] = "http://foo-dev.com:80"; |
template <class C> |
@@ -101,7 +100,6 @@ class DataReductionProxySettingsAndroidTest |
virtual void SetUp() OVERRIDE { |
env_ = base::android::AttachCurrentThread(); |
DataReductionProxySettingsAndroid::Register(env_); |
- DataReductionProxySettingsTestBase::AddProxyToCommandLine(); |
DataReductionProxySettingsTestBase::SetUp(); |
} |
@@ -118,7 +116,7 @@ TEST_F(DataReductionProxySettingsAndroidTest, TestGetDataReductionProxyOrigin) { |
Settings()->GetDataReductionProxyOrigin(env_, NULL); |
ASSERT_TRUE(result.obj()); |
const base::android::JavaRef<jstring>& str_ref = result; |
- EXPECT_EQ(GURL(kDataReductionProxyOrigin), |
+ EXPECT_EQ(GURL(expected_params_->DefaultOrigin()), |
mef
2014/06/24 17:41:56
Could you explain this change?
bengr
2014/06/24 19:01:50
I'm hoping marq@ can review this code. In a nutshe
|
GURL(ConvertJavaStringToUTF8(str_ref))); |
} |