Move cloud print specific files out of local_discovery

chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.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/ui/webui/local_discovery/local_discovery_ui_handler.h"
 
 #include <set>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/browser/local_discovery/privet_confirm_api_flow.h"
-#include "chrome/browser/local_discovery/privet_constants.h"
-#include "chrome/browser/local_discovery/privet_device_lister_impl.h"
-#include "chrome/browser/local_discovery/privet_http_asynchronous_factory.h"
 #include "chrome/browser/local_discovery/service_discovery_shared_client.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
+#include "chrome/browser/printing/cloud_print/privet_confirm_api_flow.h"
+#include "chrome/browser/printing/cloud_print/privet_constants.h"
+#include "chrome/browser/printing/cloud_print/privet_device_lister_impl.h"
+#include "chrome/browser/printing/cloud_print/privet_http_asynchronous_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/cloud_devices/common/cloud_devices_urls.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS)
 #define CLOUD_PRINT_CONNECTOR_UI_AVAILABLE
 #endif
 
+using cloud_print::CloudPrintPrinterList;
+using cloud_print::DeviceDescription;
+using cloud_print::GCDApiFlow;
+using cloud_print::PrivetRegisterOperation;
+
 namespace local_discovery {
 
 namespace {
 
 const char kDictionaryKeyServiceName[] = "service_name";
 const char kDictionaryKeyDisplayName[] = "display_name";
 const char kDictionaryKeyDescription[] = "description";
 const char kDictionaryKeyType[] = "type";
 const char kDictionaryKeyIsWifi[] = "is_wifi";
 const char kDictionaryKeyID[] = "id";
@@ skipping 109 matching lines @@
 }
 
 void LocalDiscoveryUIHandler::HandleStart(const base::ListValue* args) {
   Profile* profile = Profile::FromWebUI(web_ui());
 
   // If privet_lister_ is already set, it is a mock used for tests or the result
   // of a reload.
   if (!privet_lister_) {
     service_discovery_client_ = ServiceDiscoverySharedClient::GetInstance();
     privet_lister_.reset(
-        new PrivetDeviceListerImpl(service_discovery_client_.get(), this));
-    privet_http_factory_ = PrivetHTTPAsynchronousFactory::CreateInstance(
-        profile->GetRequestContext());
+        new cloud_print::PrivetDeviceListerImpl(service_discovery_client_.get(),
+                                                this));
+    privet_http_factory_ =
+        cloud_print::PrivetHTTPAsynchronousFactory::CreateInstance(
+            profile->GetRequestContext());
 
     SigninManagerBase* signin_manager =
         SigninManagerFactory::GetInstance()->GetForProfile(profile);
     if (signin_manager)
       signin_manager->AddObserver(this);
   }
 
   privet_lister_->Start();
   privet_lister_->DiscoverNewDevices(false);
 
@@ skipping 74 matching lines @@
 void LocalDiscoveryUIHandler::HandleShowSyncUI(
     const base::ListValue* args) {
   Browser* browser = chrome::FindBrowserWithWebContents(
       web_ui()->GetWebContents());
   DCHECK(browser);
   chrome::ShowBrowserSignin(
       browser, signin_metrics::AccessPoint::ACCESS_POINT_DEVICES_PAGE);
 }
 
 void LocalDiscoveryUIHandler::StartRegisterHTTP(
-    scoped_ptr<PrivetHTTPClient> http_client) {
+    scoped_ptr<cloud_print::PrivetHTTPClient> http_client) {
   current_http_client_ =
-      PrivetV1HTTPClient::CreateDefault(std::move(http_client));
+      cloud_print::PrivetV1HTTPClient::CreateDefault(std::move(http_client));
 
   std::string user = GetSyncAccount();
 
   if (!current_http_client_) {
     SendRegisterError();
     return;
   }
 
   current_register_operation_ =
       current_http_client_->CreateRegisterOperation(user, this);
   current_register_operation_->Start();
 }
 
 void LocalDiscoveryUIHandler::OnPrivetRegisterClaimToken(
-    PrivetRegisterOperation* operation,
+    cloud_print::PrivetRegisterOperation* operation,
     const std::string& token,
     const GURL& url) {
   web_ui()->CallJavascriptFunction(
       "local_discovery.onRegistrationConfirmedOnPrinter");
   if (device_descriptions_.count(current_http_client_->GetName()) == 0) {
     SendRegisterError();
     return;
   }
 
   confirm_api_call_flow_ = CreateApiFlow();
   if (!confirm_api_call_flow_) {
     SendRegisterError();
     return;
   }
   confirm_api_call_flow_->Start(
-      make_scoped_ptr<GCDApiFlow::Request>(new PrivetConfirmApiCallFlow(
-          token,
-          base::Bind(&LocalDiscoveryUIHandler::OnConfirmDone,
-                     base::Unretained(this)))));
+      make_scoped_ptr<GCDApiFlow::Request>(
+          new cloud_print::PrivetConfirmApiCallFlow(
+              token,
+              base::Bind(&LocalDiscoveryUIHandler::OnConfirmDone,
+                         base::Unretained(this)))));
 }
 
 void LocalDiscoveryUIHandler::OnPrivetRegisterError(
     PrivetRegisterOperation* operation,
     const std::string& action,
     PrivetRegisterOperation::FailureReason reason,
     int printer_http_code,
     const base::DictionaryValue* json) {
   std::string error;
 
   if (reason == PrivetRegisterOperation::FAILURE_JSON_ERROR &&
-      json->GetString(kPrivetKeyError, &error)) {
-    if (error == kPrivetErrorTimeout) {
+      json->GetString(cloud_print::kPrivetKeyError, &error)) {
+    if (error == cloud_print::kPrivetErrorTimeout) {
         web_ui()->CallJavascriptFunction(
             "local_discovery.onRegistrationTimeout");
       return;
-    } else if (error == kPrivetErrorCancel) {
+    } else if (error == cloud_print::kPrivetErrorCancel) {
       web_ui()->CallJavascriptFunction(
             "local_discovery.onRegistrationCanceledPrinter");
       return;
     }
   }
 
   SendRegisterError();
 }
 
 void LocalDiscoveryUIHandler::OnPrivetRegisterDone(
@@ skipping 309 matching lines @@
 
 void LocalDiscoveryUIHandler::RefreshCloudPrintStatusFromService() {
   if (cloud_print_connector_ui_enabled_)
     CloudPrintProxyServiceFactory::GetForProfile(Profile::FromWebUI(web_ui()))->
         RefreshStatusFromService();
 }
 
 #endif // cloud print connector option stuff
 
 }  // namespace local_discovery