Removed ConfigurationPolicyProvider::Provide().

chrome/browser/policy/file_based_policy_loader.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/file_based_policy_loader.h"
 
 #include "base/files/file_path_watcher.h"
 #include "base/memory/ref_counted.h"
-#include "chrome/browser/policy/policy_map.h"
+#include "chrome/browser/policy/policy_bundle.h"
 #include "content/public/browser/browser_thread.h"
 
 using ::base::files::FilePathWatcher;
 using content::BrowserThread;
 
 namespace {
 
 // Amount of time we wait for the files on disk to settle before trying to load
 // them. This alleviates the problem of reading partially written files and
 // makes it possible to batch quasi-simultaneous changes.
@@ skipping 47 matching lines @@
 
 void FileBasedPolicyLoader::OnFilePathError(const FilePath& path) {
   LOG(ERROR) << "FilePathWatcher on " << path.value()
              << " failed.";
 }
 
 void FileBasedPolicyLoader::Reload(bool force) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   if (!delegate()) {
-    PostUpdatePolicyTask(NULL);
+    scoped_ptr<PolicyBundle> empty_bundle;
+    PostUpdatePolicyTask(empty_bundle.Pass());
     return;
   }
 
   // Check the directory time in order to see whether a reload is required.
   base::TimeDelta delay;
   base::Time now = base::Time::Now();
   if (!force && !IsSafeToReloadPolicy(now, &delay)) {
     ScheduleReloadTask(delay);
     return;
   }
 
   // Load the policy definitions.
-  scoped_ptr<PolicyMap> new_policy(delegate()->Load());
+  scoped_ptr<PolicyBundle> bundle(delegate()->Load());
 
   // Check again in case the directory has changed while reading it.
   if (!force && !IsSafeToReloadPolicy(now, &delay)) {
     ScheduleReloadTask(delay);
     return;
   }
 
-  PostUpdatePolicyTask(new_policy.release());
+  PostUpdatePolicyTask(bundle.Pass());
 
   ScheduleFallbackReloadTask();
 }
 
 void FileBasedPolicyLoader::InitOnFileThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   watcher_.reset(new FilePathWatcher);
   const FilePath& path = config_file_path();
   if (!path.empty() &&
       !watcher_->Watch(path, new FileBasedPolicyWatcherDelegate(this))) {
@@ skipping 37 matching lines @@
   base::TimeDelta age = now - last_modification_clock_;
   if (age < settle_interval_) {
     *delay = settle_interval_ - age;
     return false;
   }
 
   return true;
 }
 
 }  // namespace policy