Move common cloud print methods from service/cloud_print to common/cloud_print.

chrome/service/cloud_print/connector_settings.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/service/cloud_print/connector_settings.h"
 
 #include "base/values.h"
+#include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/service/cloud_print/cloud_print_consts.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/service/service_process_prefs.h"
 
 namespace {
 
 const char kDefaultCloudPrintServerUrl[] = "https://www.google.com/cloudprint";
 const char kDeleteOnEnumFail[] = "delete_on_enum_fail";
 
 }  // namespace
 
+namespace cloud_print {
+
 ConnectorSettings::ConnectorSettings()
     : delete_on_enum_fail_(false),
       connect_new_printers_(true),
       xmpp_ping_enabled_(false),
       xmpp_ping_timeout_sec_(kDefaultXmppPingTimeoutSecs) {
 }
 
 ConnectorSettings::~ConnectorSettings() {
 }
 
 void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
   CopyFrom(ConnectorSettings());
 
   proxy_id_ = prefs->GetString(prefs::kCloudPrintProxyId, "");
   if (proxy_id_.empty()) {
-    proxy_id_ = cloud_print::PrintSystem::GenerateProxyId();
+    proxy_id_ = PrintSystem::GenerateProxyId();
     prefs->SetString(prefs::kCloudPrintProxyId, proxy_id_);
     prefs->WritePrefs();
   }
 
   // Getting print system specific settings from the preferences.
   const base::DictionaryValue* print_system_settings =
       prefs->GetDictionary(prefs::kCloudPrintPrintSystemSettings);
   if (print_system_settings) {
     print_system_settings_.reset(print_system_settings->DeepCopy());
     // TODO(vitalybuka) : Consider to rename and move out option from
@@ skipping 47 matching lines @@
 }
 
 void ConnectorSettings::SetXmppPingTimeoutSec(int timeout) {
   xmpp_ping_timeout_sec_ = timeout;
   if (xmpp_ping_timeout_sec_ < kMinimumXmppPingTimeoutSecs) {
     LOG(WARNING) <<
         "CP_CONNECTOR: XMPP ping timeout is less then minimal value";
     xmpp_ping_timeout_sec_ = kMinimumXmppPingTimeoutSecs;
   }
 }
+
+}  // namespace cloud_print