chrome/browser/prefs/command_line_pref_store_unittest.cc - Issue 1296663003: Componentize proxy code from chrome/browser/net

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/prefs/command_line_pref_store_unittest.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: updating for win p/f Created 5 years, 4 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:

Index: chrome/browser/prefs/command_line_pref_store_unittest.cc

diff --git a/chrome/browser/prefs/command_line_pref_store_unittest.cc b/chrome/browser/prefs/command_line_pref_store_unittest.cc

index d515a1c7df4939cc6ebb55183d7b15fc6a0430de..2799e29a00de1742be7daeb636f030665778867b 100644

--- a/chrome/browser/prefs/command_line_pref_store_unittest.cc

+++ b/chrome/browser/prefs/command_line_pref_store_unittest.cc

@@ -12,6 +12,7 @@

#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "components/proxy_config/proxy_config_dictionary.h"

+#include "components/proxy_config/proxy_config_pref_names.h"

#include "ui/base/ui_base_switches.h"

namespace {

@@ -32,7 +33,7 @@ class TestCommandLinePrefStore : public CommandLinePrefStore {

void VerifyProxyMode(ProxyPrefs::ProxyMode expected_mode) {

const base::Value* value = NULL;

- ASSERT_TRUE(GetValue(prefs::kProxy, &value));

+ ASSERT_TRUE(GetValue(proxy_config::prefs::kProxy, &value));

ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());

ProxyConfigDictionary dict(

static_cast<const base::DictionaryValue*>(value));

@@ -114,7 +115,7 @@ TEST(CommandLinePrefStoreTest, MultipleSwitches) {

store->VerifyProxyMode(ProxyPrefs::MODE_FIXED_SERVERS);

const base::Value* value = NULL;

- ASSERT_TRUE(store->GetValue(prefs::kProxy, &value));

+ ASSERT_TRUE(store->GetValue(proxy_config::prefs::kProxy, &value));

ASSERT_EQ(base::Value::TYPE_DICTIONARY, value->GetType());

ProxyConfigDictionary dict(static_cast<const base::DictionaryValue*>(value));