Extending ONC validator's logging. Completing toplevel validation.

chrome/browser/policy/network_configuration_updater_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 "chrome/browser/policy/network_configuration_updater.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/policy/mock_configuration_policy_provider.h"
 #include "chrome/browser/policy/policy_map.h"
 #include "chrome/browser/policy/policy_service_impl.h"
 #include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_utils.h"
 #include "policy/policy_constants.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::AtLeast;
 using testing::Mock;
 using testing::Ne;
 using testing::Return;
 using testing::_;
 
 namespace policy {
 
 static const char kFakeONC[] = "{ \"GUID\": \"1234\" }";
 static const char* kEmptyConfiguration =
-    NetworkConfigurationUpdater::kEmptyConfiguration;
+    chromeos::onc::kEmptyUnencryptedConfiguration;

[Joao da Silva, 2012/12/13 09:51:35]

Why not just remove kEmptyConfiguration and replace its uses with
chromeos::onc::kEmptyUnencryptedConfiguration?

[pneubeck (no reviews), 2012/12/13 14:10:03]

(Because it's longer.) Replaced.

 
 class NetworkConfigurationUpdaterTest
     : public testing::TestWithParam<const char*>{
  protected:
   virtual void SetUp() OVERRIDE {
     EXPECT_CALL(provider_, IsInitializationComplete())
         .WillRepeatedly(Return(true));
     provider_.Init();
     PolicyServiceImpl::Providers providers;
     providers.push_back(&provider_);
@@ skipping 126 matching lines @@
   Mock::VerifyAndClearExpectations(&network_library_);
 }
 
 INSTANTIATE_TEST_CASE_P(
     NetworkConfigurationUpdaterTestInstance,
     NetworkConfigurationUpdaterTest,
     testing::Values(key::kDeviceOpenNetworkConfiguration,
                     key::kOpenNetworkConfiguration));
 
 }  // namespace policy