Don't augment GUID in ONC merging.

chromeos/network/onc/onc_merger_unittest.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 "chromeos/network/onc/onc_merger.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
@@ skipping 35 matching lines @@
 }  // namespace
 
 namespace merger {
 
 class ONCMergerTest : public testing::Test {
  public:
   scoped_ptr<const base::DictionaryValue> user_;
   scoped_ptr<const base::DictionaryValue> policy_;
   scoped_ptr<const base::DictionaryValue> policy_without_recommended_;
   scoped_ptr<const base::DictionaryValue> device_policy_;
+  scoped_ptr<const base::DictionaryValue> active_;
 
   virtual void SetUp() {
     policy_ = test_utils::ReadTestDictionary("managed_vpn.onc");
     policy_without_recommended_ =
         test_utils::ReadTestDictionary("managed_vpn_without_recommended.onc");
     user_ = test_utils::ReadTestDictionary("user.onc");
     device_policy_ = test_utils::ReadTestDictionary("device_policy.onc");
+    active_ = test_utils::ReadTestDictionary("vpn_active_settings.onc");
   }
 };
 
 TEST_F(ONCMergerTest, MandatoryValueOverwritesUserValue) {
   scoped_ptr<base::DictionaryValue> merged(MergeSettingsAndPoliciesToEffective(
       policy_.get(), NULL, user_.get(), NULL));
   EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "Type"));
   EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "IPConfigs"));
 }
 
@@ skipping 68 matching lines @@
       policy_.get(), device_policy_.get(), user_.get(), NULL));
   EXPECT_TRUE(HaveSameValueAt(*merged, *device_policy_,
                               "VPN.OpenVPN.Username"));
 }
 
 TEST_F(ONCMergerTest, MergeToAugmented) {
   scoped_ptr<base::DictionaryValue> expected_augmented =
       test_utils::ReadTestDictionary("augmented_merge.json");
   scoped_ptr<base::DictionaryValue> merged(MergeSettingsAndPoliciesToAugmented(
       kNetworkConfigurationSignature, policy_.get(), device_policy_.get(),
-      user_.get(), NULL, NULL));
+      user_.get(), NULL, active_.get()));
   EXPECT_TRUE(test_utils::Equals(expected_augmented.get(), merged.get()));
 }
 
 }  // namespace merger
 }  // namespace onc
 }  // namespace chromeos