Split up chrome/browser/policy subdirectory

chrome/browser/chromeos/login/enrollment/enterprise_enrollment_screen.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/chromeos/login/enrollment/enterprise_enrollment_screen.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/policy/auto_enrollment_client.h"
+#include "chrome/browser/chromeos/policy/auto_enrollment_client.h"
+#include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"

[Joao da Silva, 2013/02/06 09:43:13]

Given that chrome/browser/chromeos/ is already chromeos-only, the _chromeos.h
suffix can be removed.

[Mattias Nissler (ping if slow), 2013/02/06 13:51:53]

Good idea, but let's do that in a follow-up. When renaming the file, I'll rename
the class as well, so the type name changes would propagate and cause even more
noise in the CL.

Btw. what's your feeling on dropping the "cloud" prefix on stuff that ended up
in chrome/browser/policy/cloud?

[Joao da Silva, 2013/02/06 13:59:33]

Sounds good.
Looks better to me with the prefix. A quick glance over other directories in
chrome/browser/ shows that this is not that uncommon.

The filename should also follow class names in that file, and
"CloudPolicyService" shouldn't become another "PolicyService".

 #include "chrome/browser/policy/browser_policy_connector.h"
-#include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h"
-#include "chrome/browser/policy/enterprise_metrics.h"
+#include "chrome/browser/policy/cloud/enterprise_metrics.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 
 namespace chromeos {
 
 namespace {
 
 void UMA(int sample) {
@@ skipping 256 matching lines @@
   actor_->Show();
   actor_->ShowSigninScreen();
 }
 
 void EnterpriseEnrollmentScreen::NotifyTestingObservers(bool succeeded) {
   FOR_EACH_OBSERVER(TestingObserver, observers_,
                     OnEnrollmentComplete(succeeded));
 }
 
 }  // namespace chromeos