Moved CloudPrintUrl to components/cloud_devices/cloud_devices_urls.h.

Removed unused cloud print prefs.

TBR=jochen, rogerta

Review URL: https://codereview.chromium.org/240283010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@264945 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 17 deletions

diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
index de44436..52205cd 100644
--- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc
+++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc
@@ -13,7 +13,6 @@
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/values.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "chrome/service/cloud_print/cloud_print_auth.h"
 #include "chrome/service/cloud_print/cloud_print_connector.h"
@@ -22,6 +21,7 @@
 #include "chrome/service/cloud_print/connector_settings.h"
 #include "chrome/service/net/service_url_request_context.h"
 #include "chrome/service/service_process.h"
+#include "components/cloud_devices/common/cloud_devices_switches.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/service/cloud_print/connector_settings.cc b/chrome/service/cloud_print/connector_settings.cc
index 35ed6eb..01eadc9 100644
--- a/chrome/service/cloud_print/connector_settings.cc
+++ b/chrome/service/cloud_print/connector_settings.cc
@@ -4,18 +4,16 @@
 
 #include "chrome/service/cloud_print/connector_settings.h"
 
-#include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/cloud_print/cloud_print_constants.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/service/cloud_print/print_system.h"
 #include "chrome/service/service_process_prefs.h"
+#include "components/cloud_devices/common/cloud_devices_urls.h"
 
 namespace {
 
-const char kDefaultCloudPrintServerUrl[] = "https://www.google.com/cloudprint";
 const char kDeleteOnEnumFail[] = "delete_on_enum_fail";
 const char kName[] = "name";
 const char kConnect[] = "connect";
@@ -56,17 +54,7 @@ void ConnectorSettings::InitFrom(ServiceProcessPrefs* prefs) {
   }
 
   // Check if there is an override for the cloud print server URL.
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-  server_url_ =
-      GURL(command_line.GetSwitchValueASCII(switches::kCloudPrintServiceURL));
-  if (server_url_.is_empty() || !server_url_.is_valid()) {
-    server_url_ =
-        GURL(prefs->GetString(prefs::kCloudPrintServiceURL, std::string()));
-    DCHECK(server_url_.is_empty() || server_url_.is_valid());
-    if (server_url_.is_empty() || !server_url_.is_valid()) {
-      server_url_ = GURL(kDefaultCloudPrintServerUrl);
-    }
-  }
+  server_url_ = cloud_devices::GetCloudPrintURL();
   DCHECK(server_url_.is_valid());
 
   connect_new_printers_ = prefs->GetBoolean(
diff --git a/chrome/service/cloud_print/connector_settings_unittest.cc b/chrome/service/cloud_print/connector_settings_unittest.cc
index 07f4717..b53c215 100644
--- a/chrome/service/cloud_print/connector_settings_unittest.cc
+++ b/chrome/service/cloud_print/connector_settings_unittest.cc
@@ -28,7 +28,6 @@ const char kServiceStateContent[] =
     "      'proxy_id': 'PROXY',"
     "      'robot_email': '123@cloudprint.googleusercontent.com',"
     "      'robot_refresh_token': '123',"
-    "      'service_url': 'http://cp.google.com',"
     "      'xmpp_auth_token': 'xmp token',"
     "      'xmpp_ping_enabled': true,"
     "      'xmpp_ping_timeout_sec': 256,"
@@ -99,7 +98,7 @@ TEST_F(ConnectorSettingsTest, InitFromFile) {
   scoped_ptr<ServiceProcessPrefs> prefs(CreateTestFile(kServiceStateContent));
   ConnectorSettings settings;
   settings.InitFrom(prefs.get());
-  EXPECT_EQ("http://cp.google.com/", settings.server_url().spec());
+  EXPECT_EQ("https://www.google.com/cloudprint", settings.server_url().spec());
   EXPECT_EQ("PROXY", settings.proxy_id());
   EXPECT_FALSE(settings.proxy_id().empty());
   EXPECT_TRUE(settings.delete_on_enum_fail());