policy: load JSON schema into domain descriptor at start time.

chrome/browser/policy/async_policy_provider_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/async_policy_provider.h"
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 88 matching lines @@
 void AsyncPolicyProviderTest::SetUp() {
   SetPolicy(&initial_bundle_, "policy", "initial");
   loader_ = new MockPolicyLoader(loop_.message_loop_proxy());
   EXPECT_CALL(*loader_, LastModificationTime())
       .WillRepeatedly(Return(base::Time()));
   EXPECT_CALL(*loader_, InitOnBackgroundThread()).Times(1);
   EXPECT_CALL(*loader_, MockLoad()).WillOnce(Return(&initial_bundle_));
 
   provider_.reset(
       new AsyncPolicyProvider(scoped_ptr<AsyncPolicyLoader>(loader_)));
+  // Initial load shouldn't happen until invoked.
+  EXPECT_FALSE(provider_->policies().Equals(initial_bundle_));
+
+  // Now perform an initial synchronous load.
+  provider_->InitialLoad();
+  EXPECT_TRUE(provider_->policies().Equals(initial_bundle_));
+
   provider_->Init();
-  // Verify that the initial load is done synchronously:
-  EXPECT_TRUE(provider_->policies().Equals(initial_bundle_));
 
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(loader_);
 
   EXPECT_CALL(*loader_, LastModificationTime())
       .WillRepeatedly(Return(base::Time()));
 }
 
 void AsyncPolicyProviderTest::TearDown() {
   if (provider_) {
@@ skipping 95 matching lines @@
   EXPECT_CALL(observer, OnUpdatePolicy(provider_.get())).Times(0);
   provider_->Shutdown();
   loop_.RunUntilIdle();
   Mock::VerifyAndClearExpectations(&observer);
 
   provider_->RemoveObserver(&observer);
   provider_.reset();
 }
 
 }  // namespace policy