Move the cloud policy protobufs into the component.

chrome/browser/chromeos/settings/device_oauth2_token_service.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 "chrome/browser/chromeos/settings/device_oauth2_token_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/settings/token_encryptor.h"
 #include "chrome/browser/policy/browser_policy_connector.h"
-#include "chrome/browser/policy/proto/cloud/device_management_backend.pb.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
+#include "policy/proto/device_management_backend.pb.h"
 
 namespace {
 const char kServiceScopeGetUserInfo[] =
     "https://www.googleapis.com/auth/userinfo.email";
 }
 
 namespace chromeos {
 
 // A wrapper for the consumer passed to StartRequest, which doesn't call
 // through to the target Consumer unless the refresh token validation is
@@ skipping 100 matching lines @@
   token_info->GetString("email", &gaia_robot_id);
 
   std::string policy_robot_id = token_service_->GetRobotAccountId();
 
   if (policy_robot_id == gaia_robot_id) {
     RefreshTokenIsValid(true);
   } else {
     if (gaia_robot_id.empty()) {
       LOG(WARNING) << "Device service account owner in policy is empty.";
     } else {
-      LOG(INFO) << "Device service account owner in policy does not match "
-                << "refresh token owner \"" << gaia_robot_id << "\".";
+      LOG(WARNING) << "Device service account owner in policy does not match "
+                   << "refresh token owner \"" << gaia_robot_id << "\".";
     }
     RefreshTokenIsValid(false);
   }
 }
 
 void DeviceOAuth2TokenService::ValidatingConsumer::OnOAuthError() {
   RefreshTokenIsValid(false);
 }
 
 void DeviceOAuth2TokenService::ValidatingConsumer::OnNetworkError(
@@ skipping 130 matching lines @@
     return OAuth2TokenService::CreateRequest(account_id, consumer);
 
   // Substitute our own consumer to wait for refresh token validation.
   scoped_ptr<ValidatingConsumer> validating_consumer(
       new ValidatingConsumer(this, account_id, consumer));
   validating_consumer->StartValidation();
   return validating_consumer.PassAs<RequestImpl>();
 }
 
 }  // namespace chromeos