Disable key verification by default.

components/policy/core/common/cloud/cloud_policy_constants.cc

 // Copyright (c) 2012 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 "components/policy/core/common/cloud/cloud_policy_constants.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "components/policy/core/common/policy_switches.h"
 
@@ skipping 70 matching lines @@
 const char kPolicyVerificationKeyHash[] = "1:356l7w";
 
 std::string GetPolicyVerificationKey() {
 #if defined(OS_CHROMEOS)
   // TODO(atwilson): Enable this for ChromeOS. We don't verify the extra
   // verification signatures on ChromeOS to simplify testing, and because
   // ChromeOS doesn't need the extra verification because it already stores
   // the policy blob securely.
   return std::string();
 #else
-  // Allow disabling key verification until we update the test servers with
-  // verification signatures for all QA domains (http://crbug.com/328038).
+  // Disable key verification by default until production servers generate
+  // the proper signatures.
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kSkipPolicyKeyVerification)) {
+  if (!command_line->HasSwitch(switches::kEnablePolicyKeyVerification)) {
     return std::string();
   } else {
     return std::string(reinterpret_cast<const char*>(kPolicyVerificationKey),
                        sizeof(kPolicyVerificationKey));
   }
 #endif
 }
 
 const char* GetChromeUserPolicyType() {
 #if defined(OS_ANDROID) || defined(OS_IOS)
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kFakeCloudPolicyType))
     return "google/chrome/user";
 #endif
   return dm_protocol::kChromeUserPolicyType;
 }
 
 }  // namespace policy