When a proxy command line switches are specified, policy admin warning shouldn't be shown

Removed the logic from the ConfigurationPolicyPrefStore that sets managed preferences, it's now completely handled by CommandLinePrefStore. Moved the detection of conflicting proxy settings between the managed and other stores into the PrefValueStore. Implemented a sentinel value that can be used by stores to signal that they are returning the default value. Changed managed store to use this sentinel to hide non-managed proxy settings proxy settings when proxy policy is specified.

BUG=54792
TEST=manual

Review URL: http://codereview.chromium.org/3367021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62716 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/chrome/common/pref_store.cc b/chrome/common/pref_store.cc
new file mode 100644
index 0000000..cf85417
--- /dev/null
+++ b/chrome/common/pref_store.cc
@@ -0,0 +1,14 @@
+// Copyright (c) 2010 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/common/pref_store.h"
+#include "base/values.h"
+
+Value* PrefStore::CreateUseDefaultSentinelValue() {
+  return Value::CreateNullValue();
+}
+
+bool PrefStore::IsUseDefaultSentinelValue(Value* value) {
+  return value->IsType(Value::TYPE_NULL);
+}