chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc - Issue 863203009: Store Proxy Servers as proxy servers and not GURLs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

Issue 863203009: Store Proxy Servers as proxy servers and not GURLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed failing test code. Created 5 years, 10 months 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_auth_request_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 d60ba1d453f58e657aa885774cd00c2e39fcfdb7..5279654f205fb2917fde8c68969dba16da3c7ba4 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

@@ -15,6 +15,7 @@

#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"

@@ -23,7 +24,7 @@ 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;

@@ -156,8 +157,8 @@ TEST_F(DataReductionProxySettingsAndroidTest, TestGetDataReductionProxyOrigin) {

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,

@@ -171,8 +172,8 @@ TEST_F(DataReductionProxySettingsAndroidTest,

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) {