Redesign cloud printing subsystem layer.

chrome/service/cloud_print/cloud_print_proxy.cc

 // Copyright (c) 2010 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/cloud_print_proxy.h"
 
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/service/cloud_print/cloud_print_consts.h"
@@ skipping 12 matching lines @@
 }
 
 void CloudPrintProxy::EnableForUser(const std::string& lsid) {
   DCHECK(CalledOnValidThread());
   if (backend_.get())
     return;
 
   std::string proxy_id;
   service_prefs_->prefs()->GetString(prefs::kCloudPrintProxyId, &proxy_id);
   if (proxy_id.empty()) {
-    proxy_id = cloud_print::GenerateProxyId();
+    proxy_id = cloud_print::PrintSystem::GenerateProxyId();
     service_prefs_->prefs()->SetString(prefs::kCloudPrintProxyId, proxy_id);
     service_prefs_->WritePrefs();
   }
 
   // Check if there is an override for the cloud print server URL.
   std::string cloud_print_server_url_str;
   service_prefs_->prefs()->GetString(prefs::kCloudPrintServiceURL,
                                      &cloud_print_server_url_str);
   if (cloud_print_server_url_str.empty()) {
     cloud_print_server_url_str = kDefaultCloudPrintServerUrl;
@@ skipping 51 matching lines @@
     const std::string& email) {
   DCHECK(CalledOnValidThread());
   service_prefs_->prefs()->SetString(prefs::kCloudPrintAuthToken,
                                      cloud_print_token);
   service_prefs_->prefs()->SetString(prefs::kCloudPrintXMPPAuthToken,
                                      cloud_print_xmpp_token);
   service_prefs_->prefs()->SetString(prefs::kCloudPrintEmail, email);
   service_prefs_->WritePrefs();
 }