Setup Chromad user policy plumbing

chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc

 // Copyright 2013 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 <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
 #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"
+#include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_map.h"
 #include "components/policy/core/common/policy_service.h"
@@ skipping 24 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
   std::string external_data;
   ASSERT_TRUE(base::ReadFileToString(test_dir.AppendASCII(kExternalDataPath),
                                      &external_data));
   ASSERT_FALSE(external_data.empty());
 
   std::unique_ptr<base::DictionaryValue> metadata =
       test::ConstructExternalDataReference(url.spec(), external_data);
 #if defined(OS_CHROMEOS)
   UserCloudPolicyManagerChromeOS* policy_manager =
-      UserCloudPolicyManagerFactoryChromeOS::GetForProfile(
+      UserPolicyManagerFactoryChromeOS::GetCloudPolicyManagerForProfile(
           browser()->profile());
 #else
   UserCloudPolicyManager* policy_manager =
       UserCloudPolicyManagerFactory::GetForBrowserContext(browser()->profile());
 #endif
   ASSERT_TRUE(policy_manager);
   // TODO(bartfab): The test injects an ExternalDataFetcher for an arbitrary
   // policy. This is only done because there are no policies that reference
   // external data yet. Once the first such policy is added, switch the test to
   // that policy and stop injecting a manually instantiated ExternalDataFetcher.
@@ skipping 17 matching lines @@
       &test::ExternalDataFetchCallback,
       &fetched_external_data,
       run_loop.QuitClosure()));
   run_loop.Run();
 
   ASSERT_TRUE(fetched_external_data);
   EXPECT_EQ(external_data, *fetched_external_data);
 }
 
 }  // namespace policy