summaryrefslogtreecommitdiffstats
path: root/cloud_print
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:56:32 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:56:32 +0000
commitf3c8bcf9bbe095b30500717f630e229b01cdc748 (patch)
tree317f18e23c462d4ba3f7592492a8255a661be7cc /cloud_print
parent6e23edbce20d371e9d7f34746471b47ca0651cc0 (diff)
downloadchromium_src-f3c8bcf9bbe095b30500717f630e229b01cdc748.zip
chromium_src-f3c8bcf9bbe095b30500717f630e229b01cdc748.tar.gz
chromium_src-f3c8bcf9bbe095b30500717f630e229b01cdc748.tar.bz2
Allow cloud print connector to use test gaia.
BUG=236756 NOTRY=true Review URL: https://chromiumcodereview.appspot.com/14863003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cloud_print')
-rw-r--r--cloud_print/DEPS2
-rw-r--r--cloud_print/service/win/service_utils.cc3
2 files changed, 4 insertions, 1 deletions
diff --git a/cloud_print/DEPS b/cloud_print/DEPS
index 7964ae1..f7eacc3 100644
--- a/cloud_print/DEPS
+++ b/cloud_print/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"+chrome/common",
"+chrome/installer/launcher_support",
- "+google_apis/gaia/gaia_urls.h",
+ "+google_apis",
"+grit",
"+net",
"+printing",
diff --git a/cloud_print/service/win/service_utils.cc b/cloud_print/service/win/service_utils.cc
index bf5716e..14076fe 100644
--- a/cloud_print/service/win/service_utils.cc
+++ b/cloud_print/service/win/service_utils.cc
@@ -3,6 +3,7 @@
// found in the LICENSE file.
#include "cloud_print/service/win/service_utils.h"
+#include "google_apis/gaia/gaia_switches.h"
#include <windows.h>
#include <security.h> // NOLINT
@@ -50,6 +51,8 @@ void CopyChromeSwitchesFromCurrentProcess(CommandLine* destination) {
static const char* const kSwitchesToCopy[] = {
switches::kCloudPrintServiceURL,
switches::kEnableLogging,
+ switches::kIgnoreUrlFetcherCertRequests,
+ switches::kLsoHost,
switches::kV,
};
destination->CopySwitchesFrom(*CommandLine::ForCurrentProcess(),