From 4f8fef18a609bb268a6a6490377c301fb6a9796e Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 13:15:07 +1100
Subject: [PATCH 01/77] [Google Services] Removed bad target, Added m.google.*
 and google.*/mobile

---
 src/chrome/content/rules/GoogleServices.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 838bf6f62df0..8b05c8d30fec 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -1,6 +1,4 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6, 'Could not resolve host: googleusercontent.com')
 	Other Google rulesets:
 
 		- 2mdn.net.xml
@@ -139,6 +137,7 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 			- knol
 			- knoll		(→ knol)
 			- lh\d
+			- m
 			- mail
 			- chatenabled.mail
 			- pack
@@ -182,7 +181,7 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 	XXX: Needs more testing
 
 -->
-<ruleset name="Google Services" default_off='failed ruleset test'>
+<ruleset name="Google Services">
 
 	<target host="*.ggpht.com" />
 	<target host="gmail.com" />
@@ -234,7 +233,7 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 	<target host="*.googlesource.com" />
 	<target host="*.googlesyndication.com" />
 	<target host="www.googletagservices.com" />
-	<target host="googleusercontent.com" />
+	<!--target host="googleusercontent.com" /-->
 	<target host="*.googleusercontent.com" />
 		<!--
 			Necessary for the Followers widget:
@@ -285,7 +284,7 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 
 	<!--	Paths that work on all in google.*
 							-->
-	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/(accounts|adplanner|ads|adsense|adwords|analytics|bookmarks|books|chrome|chromecast|contacts|coop|cse|css|culturalinstitute|doodles|earth|favicon\.ico|finance|get|goodtoknow|googleblogs|grants|green|hangouts|hostednews|images|intl|js|landing|logos|mapmaker|newproducts|news|nexus|patents|policies|prdhp|profiles|products|reader|s2|script|settings|shopping|support|tisp|tools|transparencyreport|trends|urchin|webmasters)(?=$|[?/])"
+	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/(accounts|adplanner|ads|adsense|adwords|analytics|bookmarks|books|chrome|chromecast|contacts|coop|cse|css|culturalinstitute|doodles|earth|favicon\.ico|finance|get|goodtoknow|googleblogs|grants|green|hangouts|hostednews|images|intl|js|landing|logos|mapmaker|mobile|newproducts|news|nexus|patents|policies|prdhp|profiles|products|reader|s2|script|settings|shopping|support|tisp|tools|transparencyreport|trends|urchin|webmasters)(?=$|[?/])"
 		 to="https://www.google.$1/$2" />
 
 	<!--	Paths that 404 on .ccltd, but work on .com:
@@ -303,7 +302,7 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 
 	<!--	Subdomains that work on all in google.*
 							-->
-	<rule from="^http://(accounts|adwords|finance|groups|id|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
+	<rule from="^http://(accounts|adwords|finance|groups|id|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
 		to="https://$1.google.$2/" />
 
 	<!--	Subdomains that only exist/work on .com
@@ -355,6 +354,4 @@ Fetch error: http://googleusercontent.com/ => http://googleusercontent.com/: (6,
 
 	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
 		to="https://$1.googleusercontent.com/" />
-	
-
 </ruleset>

From 48afcf30602527c527453128ab2dc3005ee03001 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:10:10 +1100
Subject: [PATCH 02/77] [Google Services] lh\d. works on google.tld

---
 src/chrome/content/rules/GoogleServices.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 8b05c8d30fec..99ac08313987 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -182,7 +182,6 @@
 
 -->
 <ruleset name="Google Services">
-
 	<target host="*.ggpht.com" />
 	<target host="gmail.com" />
 	<target host="www.gmail.com" />
@@ -233,7 +232,7 @@
 	<target host="*.googlesource.com" />
 	<target host="*.googlesyndication.com" />
 	<target host="www.googletagservices.com" />
-	<!--target host="googleusercontent.com" /-->
+	<!--target host="googleusercontent.com" doesn't work /-->
 	<target host="*.googleusercontent.com" />
 		<!--
 			Necessary for the Followers widget:
@@ -266,10 +265,10 @@
 					-->
 	<rule from="^http://lh(\d)\.ggpht\.com/"
 		to="https://lh$1.ggpht.com/" />
-
-	<rule from="^http://lh(\d)\.google\.ca/"
-		to="https://lh$1.google.ca/" />
-
+		<test url="http://ln3.ggpht.com/" />
+		<test url="http://ln4.ggpht.com/" />
+		<test url="http://ln5.ggpht.com/" />
+		<test url="http://ln6.ggpht.com/" />
 
 	<rule from="^http://(www\.)?g(oogle)?mail\.com/"
 		to="https://$1g$2mail.com/" />
@@ -302,12 +301,12 @@
 
 	<!--	Subdomains that work on all in google.*
 							-->
-	<rule from="^http://(accounts|adwords|finance|groups|id|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
 		to="https://$1.google.$2/" />
 
 	<!--	Subdomains that only exist/work on .com
 							-->
-	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients[12]|cloud|code|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|lh\d|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
+	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients[12]|cloud|code|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
 		to="https://$1.google.com/" />
 
 	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>

From 462737403f28378298ab76c7517904f6a93f00bf Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:13:04 +1100
Subject: [PATCH 03/77] [Google Services] Added tests for Subdomains that work
 on all in google.*

---
 src/chrome/content/rules/GoogleServices.xml | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 99ac08313987..116c945557f6 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -303,6 +303,30 @@
 							-->
 	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
 		to="https://$1.google.$2/" />
+		<test url="http://accounts.google.ca/" />
+		<test url="http://accounts.google.com/" />
+		<test url="http://accounts.google.com.au/" />
+		<test url="http://adwords.google.ca/" />
+		<test url="http://adwords.google.com/" />
+		<test url="http://adwords.google.com.au/" />
+		<test url="http://finance.google.ca/" />
+		<test url="http://finance.google.com/" />
+		<test url="http://finance.google.com.au/" />
+		<test url="http://groups.google.ca/" />
+		<test url="http://groups.google.com/" />
+		<test url="http://groups.google.com.au/" />
+		<test url="http://id.google.ca/" />
+		<test url="http://id.google.com/" />
+		<test url="http://id.google.com.au/" />
+		<test url="http://ln3.google.ca/" />
+		<test url="http://ln4.google.com/" />
+		<test url="http://ln5.google.com.au/" />
+		<test url="http://m.google.ca/" />
+		<test url="http://m.google.com/" />
+		<test url="http://m.google.com.au/" />
+		<test url="http://picasaweb.google.ca/" />
+		<test url="http://picasaweb.google.com/" />
+		<test url="http://picasaweb.google.com.au/" />
 
 	<!--	Subdomains that only exist/work on .com
 							-->

From 61a3c9ca384febd7b6c8929b0f8c410970885173 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:35:10 +1100
Subject: [PATCH 04/77] [Google Services] Added tests for Subdomains that only
 exist/work on .com

---
 src/chrome/content/rules/GoogleServices.xml | 79 ++++++++++++++++++++-
 1 file changed, 77 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 116c945557f6..4088556f3ac3 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -330,8 +330,83 @@
 
 	<!--	Subdomains that only exist/work on .com
 							-->
-	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients[12]|cloud|code|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
-		to="https://$1.google.com/" />
+	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients\d?|cloud|code|corp|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
+			to="https://$1.google.com/" />
+
+	<test url="http://google.com/" />
+	<test url="http://admin.google.com/" />
+	<test url="http://apis.google.com/" />
+	<test url="http://appengine.google.com/" />
+	<test url="http://calendar.google.com/" />
+	<test url="http://cast.google.com/" />
+	<test url="http://cbks0.google.com/" />
+	<test url="http://chat.google.com/" />
+	<test url="http://checkout.google.com/" />
+	<test url="http://chrome.google.com/" />
+	<test url="http://clients.google.com/" />
+		<test url="http://clients1.google.com/" />
+		<test url="http://clients2.google.com/" />
+		<test url="http://clients3.google.com/" />
+	<test url="http://cloud.google.com/" />
+	<test url="http://code.google.com/" />
+	<test url="http://corp.google.com/" />
+		<test url="http://login.corp.google.com/" />
+		<test url="http://ideas.corp.google.com/" />
+		<test url="http://discovery.corp.google.com/" />
+	<test url="http://developers.google.com/" />
+	<test url="http://dl.google.com/" />
+	<test url="http://docs.google.com/" />
+		<test url="http://docs1.google.com/" />
+		<test url="http://docs2.google.com/" />
+		<test url="http://docs3.google.com/" />
+		<test url="http://1.docs.google.com/" />
+		<test url="http://2.docs.google.com/" />
+		<test url="http://3.docs.google.com/" />
+	<test url="http://drive.google.com/" />
+	<test url="http://encrypted.google.com/" />
+		<test url="http://encrypted-tbn1.google.com/" />
+		<test url="http://encrypted-tbn2.google.com/" />
+		<test url="http://encrypted-tbn3.google.com/" />
+	<test url="http://feedburner.google.com/" />
+	<test url="http://feedproxy.google.com/" />
+	<test url="http://fiber.google.com/" />
+	<test url="http://fonts.google.com/" />
+	<test url="http://gg.google.com/" />
+	<test url="http://glass.google.com/" />
+	<test url="http://goto.google.com/" />
+	<test url="http://health.google.com/" />
+	<test url="http://helpouts.google.com/" />
+	<test url="http://history.google.com/" />
+	<test url="http://talkgadget.google.com/" />
+	<test url="http://hostedtalkgadget.google.com/" />
+	<test url="http://investor.google.com/" />
+	<test url="http://ipv4.google.com/" />
+	<test url="http://mail.google.com/" />
+		<test url="http://chatenabled.mail.google.com/" />
+	<test url="http://pack.google.com/" />
+	<test url="http://pki.google.com/" />
+	<test url="http://play.google.com/" />
+	<test url="http://plus.google.com/" />
+		<test url="http://plus.sandbox.google.com/" />
+	<test url="http://plusone.google.com/" />
+	<test url="http://productforums.google.com/" />
+	<test url="http://profiles.google.com/" />
+	<test url="http://safebrowsing-cache.google.com/" />
+	<test url="http://cert-test.sandbox.google.com/" />
+	<test url="http://sb-ssl.google.com/" />
+	<test url="http://script.google.com/" />
+	<test url="http://security.google.com/" />
+	<test url="http://services.google.com/" />
+	<test url="http://servicessites.google.com/" />
+	<test url="http://sites.google.com/" />
+	<test url="http://spreadsheets.google.com/" />
+		<test url="http://spreadsheets1.google.com/" />
+		<test url="http://spreadsheets2.google.com/" />
+		<test url="http://spreadsheets3.google.com/" />
+	<test url="http://support.google.com/" />
+	<test url="http://talk.google.com/" />
+	<test url="http://tools.google.com/" />
+	<test url="http://wallet.google.com/" />
 
 	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
 

From a1b0772ec29a3040a691abbb052d04e0956ccf5e Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:39:30 +1100
Subject: [PATCH 05/77] [Google Services] Added more tests, merged knoll? with
 existing rule

---
 src/chrome/content/rules/GoogleServices.xml | 163 ++++++++++----------
 1 file changed, 81 insertions(+), 82 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 4088556f3ac3..67f58db6f846 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -330,114 +330,113 @@
 
 	<!--	Subdomains that only exist/work on .com
 							-->
-	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients\d?|cloud|code|corp|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
+	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients\d?|cloud|code|corp|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|knoll?|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
 			to="https://$1.google.com/" />
 
-	<test url="http://google.com/" />
-	<test url="http://admin.google.com/" />
-	<test url="http://apis.google.com/" />
-	<test url="http://appengine.google.com/" />
-	<test url="http://calendar.google.com/" />
-	<test url="http://cast.google.com/" />
-	<test url="http://cbks0.google.com/" />
-	<test url="http://chat.google.com/" />
-	<test url="http://checkout.google.com/" />
-	<test url="http://chrome.google.com/" />
-	<test url="http://clients.google.com/" />
-		<test url="http://clients1.google.com/" />
-		<test url="http://clients2.google.com/" />
-		<test url="http://clients3.google.com/" />
-	<test url="http://cloud.google.com/" />
-	<test url="http://code.google.com/" />
-	<test url="http://corp.google.com/" />
-		<test url="http://login.corp.google.com/" />
-		<test url="http://ideas.corp.google.com/" />
-		<test url="http://discovery.corp.google.com/" />
-	<test url="http://developers.google.com/" />
-	<test url="http://dl.google.com/" />
-	<test url="http://docs.google.com/" />
-		<test url="http://docs1.google.com/" />
-		<test url="http://docs2.google.com/" />
-		<test url="http://docs3.google.com/" />
-		<test url="http://1.docs.google.com/" />
-		<test url="http://2.docs.google.com/" />
-		<test url="http://3.docs.google.com/" />
-	<test url="http://drive.google.com/" />
-	<test url="http://encrypted.google.com/" />
-		<test url="http://encrypted-tbn1.google.com/" />
-		<test url="http://encrypted-tbn2.google.com/" />
-		<test url="http://encrypted-tbn3.google.com/" />
-	<test url="http://feedburner.google.com/" />
-	<test url="http://feedproxy.google.com/" />
-	<test url="http://fiber.google.com/" />
-	<test url="http://fonts.google.com/" />
-	<test url="http://gg.google.com/" />
-	<test url="http://glass.google.com/" />
-	<test url="http://goto.google.com/" />
-	<test url="http://health.google.com/" />
-	<test url="http://helpouts.google.com/" />
-	<test url="http://history.google.com/" />
-	<test url="http://talkgadget.google.com/" />
-	<test url="http://hostedtalkgadget.google.com/" />
-	<test url="http://investor.google.com/" />
-	<test url="http://ipv4.google.com/" />
-	<test url="http://mail.google.com/" />
-		<test url="http://chatenabled.mail.google.com/" />
-	<test url="http://pack.google.com/" />
-	<test url="http://pki.google.com/" />
-	<test url="http://play.google.com/" />
-	<test url="http://plus.google.com/" />
-		<test url="http://plus.sandbox.google.com/" />
-	<test url="http://plusone.google.com/" />
-	<test url="http://productforums.google.com/" />
-	<test url="http://profiles.google.com/" />
-	<test url="http://safebrowsing-cache.google.com/" />
-	<test url="http://cert-test.sandbox.google.com/" />
-	<test url="http://sb-ssl.google.com/" />
-	<test url="http://script.google.com/" />
-	<test url="http://security.google.com/" />
-	<test url="http://services.google.com/" />
-	<test url="http://servicessites.google.com/" />
-	<test url="http://sites.google.com/" />
-	<test url="http://spreadsheets.google.com/" />
-		<test url="http://spreadsheets1.google.com/" />
-		<test url="http://spreadsheets2.google.com/" />
-		<test url="http://spreadsheets3.google.com/" />
-	<test url="http://support.google.com/" />
-	<test url="http://talk.google.com/" />
-	<test url="http://tools.google.com/" />
-	<test url="http://wallet.google.com/" />
+		<test url="http://google.com/" />
+		<test url="http://admin.google.com/" />
+		<test url="http://apis.google.com/" />
+		<test url="http://appengine.google.com/" />
+		<test url="http://calendar.google.com/" />
+		<test url="http://cast.google.com/" />
+		<test url="http://cbks0.google.com/" />
+		<test url="http://chat.google.com/" />
+		<test url="http://checkout.google.com/" />
+		<test url="http://chrome.google.com/" />
+		<test url="http://clients.google.com/" />
+			<test url="http://clients1.google.com/" />
+			<test url="http://clients2.google.com/" />
+			<test url="http://clients3.google.com/" />
+		<test url="http://cloud.google.com/" />
+		<test url="http://code.google.com/" />
+		<test url="http://corp.google.com/" />
+			<test url="http://login.corp.google.com/" />
+			<test url="http://ideas.corp.google.com/" />
+			<test url="http://discovery.corp.google.com/" />
+		<test url="http://developers.google.com/" />
+		<test url="http://dl.google.com/" />
+		<test url="http://docs.google.com/" />
+			<test url="http://docs1.google.com/" />
+			<test url="http://docs2.google.com/" />
+			<test url="http://docs3.google.com/" />
+			<test url="http://1.docs.google.com/" />
+			<test url="http://2.docs.google.com/" />
+			<test url="http://3.docs.google.com/" />
+		<test url="http://drive.google.com/" />
+		<test url="http://encrypted.google.com/" />
+			<test url="http://encrypted-tbn1.google.com/" />
+			<test url="http://encrypted-tbn2.google.com/" />
+			<test url="http://encrypted-tbn3.google.com/" />
+		<test url="http://feedburner.google.com/" />
+		<test url="http://feedproxy.google.com/" />
+		<test url="http://fiber.google.com/" />
+		<test url="http://fonts.google.com/" />
+		<test url="http://gg.google.com/" />
+		<test url="http://glass.google.com/" />
+		<test url="http://goto.google.com/" />
+		<test url="http://health.google.com/" />
+		<test url="http://helpouts.google.com/" />
+		<test url="http://history.google.com/" />
+		<test url="http://talkgadget.google.com/" />
+		<test url="http://hostedtalkgadget.google.com/" />
+		<test url="http://investor.google.com/" />
+		<test url="http://ipv4.google.com/" />
+		<test url="http://knol.google.com/" />
+		<test url="http://knoll.google.com/" />
+		<test url="http://mail.google.com/" />
+			<test url="http://chatenabled.mail.google.com/" />
+		<test url="http://pack.google.com/" />
+		<test url="http://pki.google.com/" />
+		<test url="http://play.google.com/" />
+		<test url="http://plus.google.com/" />
+			<test url="http://plus.sandbox.google.com/" />
+		<test url="http://plusone.google.com/" />
+		<test url="http://productforums.google.com/" />
+		<test url="http://profiles.google.com/" />
+		<test url="http://safebrowsing-cache.google.com/" />
+		<test url="http://cert-test.sandbox.google.com/" />
+		<test url="http://sb-ssl.google.com/" />
+		<test url="http://script.google.com/" />
+		<test url="http://security.google.com/" />
+		<test url="http://services.google.com/" />
+		<test url="http://servicessites.google.com/" />
+		<test url="http://sites.google.com/" />
+		<test url="http://spreadsheets.google.com/" />
+			<test url="http://spreadsheets1.google.com/" />
+			<test url="http://spreadsheets2.google.com/" />
+			<test url="http://spreadsheets3.google.com/" />
+		<test url="http://support.google.com/" />
+		<test url="http://talk.google.com/" />
+		<test url="http://tools.google.com/" />
+		<test url="http://wallet.google.com/" />
 
 	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
 
 	<rule from="^http://earth\.google\.com/"
 		to="https://www.google.com/earth/" />
+		<test url="http://earth.google.com/" />
 
 	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
 		to="https://www.google.$1/intl/" />
+		<test url="http://scholar.google.ca/intl/" />
+		<test url="http://scholar.google.com/intl/" />
+		<test url="http://scholar.google.com.au/intl/" />
 
 	<rule from="^http://(?:encrypted-)?tbn2\.google\.com/"
 		to="https://encrypted-tbn2.google.com/" />
 
-
-	<rule from="^http://knoll?\.google\.com/"
-		to="https://knol.google.com/" />
-
-
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 
 	<rule from="^http://trends\.google\.com/"
 		 to="https://www.google.com/trends" />
 
-
 	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
 		 to="https://$1googlecode.com/" />
 
 	<rule from="^http://([^\./]\.)?googlesource\.com/"
 		to="https://$1googlesource.com/" />
 
-
 	<rule from="^http://partner\.googleadservices\.com/"
 		 to="https://partner.googleadservices.com/" />
 

From 7d7161e487f05bbff79b190f1f7c27c2377a101d Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:42:24 +1100
Subject: [PATCH 06/77] [Google Services] encrypted-tbn\d and tbn\d

---
 src/chrome/content/rules/GoogleServices.xml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 67f58db6f846..2cf7b2f4e2de 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -422,8 +422,11 @@
 		<test url="http://scholar.google.com/intl/" />
 		<test url="http://scholar.google.com.au/intl/" />
 
-	<rule from="^http://(?:encrypted-)?tbn2\.google\.com/"
-		to="https://encrypted-tbn2.google.com/" />
+	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
+		to="https://encrypted-tbn$1.google.com/" />
+		<test url="http://tbn2.google.com/" />
+		<test url="http://encrypted-tbn2.google.com/" />
+		<test url="http://tbn1.google.com/" />
 
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />

From 3ab1681cd8da865ae9624d213d25ad0b5afaae06 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:45:45 +1100
Subject: [PATCH 07/77] [Google Services] Added *.corp.googleusercontent.com
 and tests.

---
 src/chrome/content/rules/GoogleServices.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 2cf7b2f4e2de..d624fca400d7 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -234,6 +234,7 @@
 	<target host="www.googletagservices.com" />
 	<!--target host="googleusercontent.com" doesn't work /-->
 	<target host="*.googleusercontent.com" />
+	<target host="*.corp.googleusercontent.com" />
 		<!--
 			Necessary for the Followers widget:
 
@@ -454,4 +455,7 @@
 
 	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
 		to="https://$1.googleusercontent.com/" />
+		<test url="http://webcache.googleusercontent.com/" />
+		<test url="http://foo.googleusercontent.com/" />
+		<test url="http://bar.googleusercontent.com/" />
 </ruleset>

From 71ffe5bc0e4f143a1dd59585aa1ff707ad1a6410 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:49:10 +1100
Subject: [PATCH 08/77] [Google Services] Moving wildcard subdomains together,
 adding more tests.

---
 src/chrome/content/rules/GoogleServices.xml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index d624fca400d7..1a1d05ca11af 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -435,9 +435,6 @@
 	<rule from="^http://trends\.google\.com/"
 		 to="https://www.google.com/trends" />
 
-	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
-		 to="https://$1googlecode.com/" />
-
 	<rule from="^http://([^\./]\.)?googlesource\.com/"
 		to="https://$1googlesource.com/" />
 
@@ -452,10 +449,18 @@
 	<rule from="^http://www\.googletagservices\.com/tag/js/"
 		to="https://www.googletagservices.com/tag/js/" />
 
+	<!-- wildcards -->
 
 	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
 		to="https://$1.googleusercontent.com/" />
 		<test url="http://webcache.googleusercontent.com/" />
 		<test url="http://foo.googleusercontent.com/" />
 		<test url="http://bar.googleusercontent.com/" />
+
+	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
+		 to="https://$1googlecode.com/" />
+		<test url="http://foo.googlecode.com/" />
+		<test url="http://bar.googlecode.com/" />
+		<test url="http://www.googlecode.com/" />
+
 </ruleset>

From fae25ab74189045c33a2c6f876f3a4fa691c0ed9 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:51:05 +1100
Subject: [PATCH 09/77] [Google Services] merging subdoomain to path redirects

---
 src/chrome/content/rules/GoogleServices.xml | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 1a1d05ca11af..febbece7ee59 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -413,10 +413,6 @@
 
 	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
 
-	<rule from="^http://earth\.google\.com/"
-		to="https://www.google.com/earth/" />
-		<test url="http://earth.google.com/" />
-
 	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
 		to="https://www.google.$1/intl/" />
 		<test url="http://scholar.google.ca/intl/" />
@@ -432,9 +428,6 @@
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 
-	<rule from="^http://trends\.google\.com/"
-		 to="https://www.google.com/trends" />
-
 	<rule from="^http://([^\./]\.)?googlesource\.com/"
 		to="https://$1googlesource.com/" />
 
@@ -449,6 +442,12 @@
 	<rule from="^http://www\.googletagservices\.com/tag/js/"
 		to="https://www.googletagservices.com/tag/js/" />
 
+	<!-- subdomain to path redirects -->
+	<rule from="^http://(earth|trends)\.google\.com/"
+		 to="https://www.google.com/$1" />
+		<test url="http://earth.google.com/" />
+		<test url="http://trends.google.com/" />
+
 	<!-- wildcards -->
 
 	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"

From 835a6fe320d3b0a78e973da0200598852d0a2d51 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 20:53:04 +1100
Subject: [PATCH 10/77] [Google Services] Added tests for *googlesource.com

---
 src/chrome/content/rules/GoogleServices.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index febbece7ee59..9dbc62c05128 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -428,9 +428,6 @@
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 
-	<rule from="^http://([^\./]\.)?googlesource\.com/"
-		to="https://$1googlesource.com/" />
-
 	<rule from="^http://partner\.googleadservices\.com/"
 		 to="https://partner.googleadservices.com/" />
 
@@ -462,4 +459,10 @@
 		<test url="http://bar.googlecode.com/" />
 		<test url="http://www.googlecode.com/" />
 
+	<rule from="^http://([^@:\./]+)?googlesource\.com/"
+		to="https://$1googlesource.com/" />
+		<test url="http://foo.googlesource.com/" />
+		<test url="http://bar.googlesource.com/" />
+		<test url="http://www.googlesource.com/" />
+
 </ruleset>

From 14a2719e1be752b7f87fa3151c43fa7da6932033 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 21:00:45 +1100
Subject: [PATCH 11/77] [Google Services] Protecting the whole of
 www.google.com and google.com

---
 src/chrome/content/rules/GoogleServices.xml | 27 ++++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 9dbc62c05128..debf214450f2 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -297,8 +297,25 @@
 
 	<!--	Paths that only exist/work on .com
 							-->
-	<rule from="^http://(?:www\.)?google\.com/(\+|appsstatus|buzz|chat|chromeos|extern_js|glass|googlebooks|ig|insights|moderator|phone|safebrowsing|videotargetting|webfonts)(?=$|[?/])"
-		to="https://www.google.com/$1" />
+	<rule from="^http://(www\.)?google\.com/"
+			to="https://www.google.com/" />
+		<test url="http://google.com/" />
+		<test url="http://www.google.com/" />
+		<test url="http://www.google.com/+" />
+		<test url="http://www.google.com/appsstatus" />
+		<test url="http://www.google.com/buzz" />
+		<test url="http://www.google.com/chat" />
+		<test url="http://www.google.com/chromeos" />
+		<test url="http://www.google.com/extern_js" />
+		<test url="http://www.google.com/glass" />
+		<test url="http://www.google.com/googlebooks" />
+		<test url="http://www.google.com/ig" />
+		<test url="http://www.google.com/insights" />
+		<test url="http://www.google.com/moderator" />
+		<test url="http://www.google.com/phone" />
+		<test url="http://www.google.com/safebrowsing" />
+		<test url="http://www.google.com/videotargetting" />
+		<test url="http://www.google.com/webfonts" />
 
 	<!--	Subdomains that work on all in google.*
 							-->
@@ -331,10 +348,9 @@
 
 	<!--	Subdomains that only exist/work on .com
 							-->
-	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients\d?|cloud|code|corp|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass||goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|knoll?|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
+	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients\d?|cloud|code|corp|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass|goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|knoll?|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
 			to="https://$1.google.com/" />
 
-		<test url="http://google.com/" />
 		<test url="http://admin.google.com/" />
 		<test url="http://apis.google.com/" />
 		<test url="http://appengine.google.com/" />
@@ -411,6 +427,9 @@
 		<test url="http://tools.google.com/" />
 		<test url="http://wallet.google.com/" />
 
+	<!-- This is needed for OCSP responder to work.
+	If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
+		-->
 	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
 
 	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"

From f892c1205d2a49944f7093ee742f56ea4b94af9f Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 15 Feb 2015 21:10:18 +1100
Subject: [PATCH 12/77] [Google Services] Lots of test urls, cleared up some
 rules

---
 src/chrome/content/rules/GoogleServices.xml | 203 ++++++++++++++++++--
 1 file changed, 186 insertions(+), 17 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index debf214450f2..7ef83e92225d 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -259,6 +259,13 @@
 	<securecookie host="^googlemail\.com$" name=".+" />
 	<securecookie host="^www\.googlemail\.com$" name=".+" />
 
+	<!-- Gmail -->
+	<rule from="^http://(www\.)?g(oogle)?mail\.com/"
+		to="https://$1g$2mail.com/" />
+		<test url="http://www.gmail.com/" />
+		<test url="http://www.googlemail.com/" />
+		<test url="http://gmail.com/" />
+		<test url="http://googlemail.com/" />
 
 	<!--    - lh 3-6 exist
 		- All appear identical
@@ -271,29 +278,181 @@
 		<test url="http://ln5.ggpht.com/" />
 		<test url="http://ln6.ggpht.com/" />
 
-	<rule from="^http://(www\.)?g(oogle)?mail\.com/"
-		to="https://$1g$2mail.com/" />
-
-	<rule from="^http://(?:www\.)?goo\.gl/"
+	<rule from="^http://(www\.)?goo\.gl/"
 		to="https://goo.gl/" />
-
-	<!--	tisp$ 404s:
-				-->
-	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
-		to="https://www.google.$1/tisp/" />
+		<test url="http://www.goo.gl/" />
+		<test url="http://goo.gl/" />
 
 	<!--	Paths that work on all in google.*
 							-->
-	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/(accounts|adplanner|ads|adsense|adwords|analytics|bookmarks|books|chrome|chromecast|contacts|coop|cse|css|culturalinstitute|doodles|earth|favicon\.ico|finance|get|goodtoknow|googleblogs|grants|green|hangouts|hostednews|images|intl|js|landing|logos|mapmaker|mobile|newproducts|news|nexus|patents|policies|prdhp|profiles|products|reader|s2|script|settings|shopping|support|tisp|tools|transparencyreport|trends|urchin|webmasters)(?=$|[?/])"
-		 to="https://www.google.$1/$2" />
-
-	<!--	Paths that 404 on .ccltd, but work on .com:
-								-->
-	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
-		 to="https://www.google.com/" />
-
+	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
+		 to="https://www.google.$1/" />
+		<test url="http://www.google.ca/accounts" />
+		<test url="http://www.google.com/accounts" />
+		<test url="http://www.google.com.au/accounts" />
+		<test url="http://www.google.ca/adplanner" />
+		<test url="http://www.google.com/adplanner" />
+		<test url="http://www.google.com.au/adplanner" />
+		<test url="http://www.google.ca/ads" />
+		<test url="http://www.google.com/ads" />
+		<test url="http://www.google.com.au/ads" />
+		<test url="http://www.google.ca/adsense" />
+		<test url="http://www.google.com/adsense" />
+		<test url="http://www.google.com.au/adsense" />
+		<test url="http://www.google.ca/adwords" />
+		<test url="http://www.google.com/adwords" />
+		<test url="http://www.google.com.au/adwords" />
+		<test url="http://www.google.ca/analytics" />
+		<test url="http://www.google.com/analytics" />
+		<test url="http://www.google.com.au/analytics" />
+		<test url="http://www.google.ca/bookmarks" />
+		<test url="http://www.google.com/bookmarks" />
+		<test url="http://www.google.com.au/bookmarks" />
+		<test url="http://www.google.ca/books" />
+		<test url="http://www.google.com/books" />
+		<test url="http://www.google.com.au/books" />
+		<test url="http://www.google.ca/chrome" />
+		<test url="http://www.google.com/chrome" />
+		<test url="http://www.google.com.au/chrome" />
+		<test url="http://www.google.ca/chromecast" />
+		<test url="http://www.google.com/chromecast" />
+		<test url="http://www.google.com.au/chromecast" />
+		<test url="http://www.google.ca/contacts" />
+		<test url="http://www.google.com/contacts" />
+		<test url="http://www.google.com.au/contacts" />
+		<test url="http://www.google.ca/coop" />
+		<test url="http://www.google.com/coop" />
+		<test url="http://www.google.com.au/coop" />
+		<test url="http://www.google.ca/cse" />
+		<test url="http://www.google.com/cse" />
+		<test url="http://www.google.com.au/cse" />
+		<test url="http://www.google.ca/css" />
+		<test url="http://www.google.com/css" />
+		<test url="http://www.google.com.au/css" />
+		<test url="http://www.google.ca/culturalinstitute" />
+		<test url="http://www.google.com/culturalinstitute" />
+		<test url="http://www.google.com.au/culturalinstitute" />
+		<test url="http://www.google.ca/doodles" />
+		<test url="http://www.google.com/doodles" />
+		<test url="http://www.google.com.au/doodles" />
+		<test url="http://www.google.ca/earth" />
+		<test url="http://www.google.com/earth" />
+		<test url="http://www.google.com.au/earth" />
+		<test url="http://www.google.ca/favicon.ico" />
+		<test url="http://www.google.com/favicon.ico" />
+		<test url="http://www.google.com.au/favicon.ico" />
+		<test url="http://www.google.ca/finance" />
+		<test url="http://www.google.com/finance" />
+		<test url="http://www.google.com.au/finance" />
+		<test url="http://www.google.ca/get" />
+		<test url="http://www.google.com/get" />
+		<test url="http://www.google.com.au/get" />
+		<test url="http://www.google.ca/goodtoknow" />
+		<test url="http://www.google.com/goodtoknow" />
+		<test url="http://www.google.com.au/goodtoknow" />
+		<test url="http://www.google.ca/googleblogs" />
+		<test url="http://www.google.com/googleblogs" />
+		<test url="http://www.google.com.au/googleblogs" />
+		<test url="http://www.google.ca/grants" />
+		<test url="http://www.google.com/grants" />
+		<test url="http://www.google.com.au/grants" />
+		<test url="http://www.google.ca/green" />
+		<test url="http://www.google.com/green" />
+		<test url="http://www.google.com.au/green" />
+		<test url="http://www.google.ca/hangouts" />
+		<test url="http://www.google.com/hangouts" />
+		<test url="http://www.google.com.au/hangouts" />
+		<test url="http://www.google.ca/hostednews" />
+		<test url="http://www.google.com/hostednews" />
+		<test url="http://www.google.com.au/hostednews" />
+		<test url="http://www.google.ca/images" />
+		<test url="http://www.google.com/images" />
+		<test url="http://www.google.com.au/images" />
+		<test url="http://www.google.ca/intl" />
+		<test url="http://www.google.com/intl" />
+		<test url="http://www.google.com.au/intl" />
+		<test url="http://www.google.ca/js" />
+		<test url="http://www.google.com/js" />
+		<test url="http://www.google.com.au/js" />
+		<test url="http://www.google.ca/landing" />
+		<test url="http://www.google.com/landing" />
+		<test url="http://www.google.com.au/landing" />
+		<test url="http://www.google.ca/logos" />
+		<test url="http://www.google.com/logos" />
+		<test url="http://www.google.com.au/logos" />
+		<test url="http://www.google.ca/mapmaker" />
+		<test url="http://www.google.com/mapmaker" />
+		<test url="http://www.google.com.au/mapmaker" />
+		<test url="http://www.google.ca/mobile" />
+		<test url="http://www.google.com/mobile" />
+		<test url="http://www.google.com.au/mobile" />
+		<test url="http://www.google.ca/newproducts" />
+		<test url="http://www.google.com/newproducts" />
+		<test url="http://www.google.com.au/newproducts" />
+		<test url="http://www.google.ca/news" />
+		<test url="http://www.google.com/news" />
+		<test url="http://www.google.com.au/news" />
+		<test url="http://www.google.ca/nexus" />
+		<test url="http://www.google.com/nexus" />
+		<test url="http://www.google.com.au/nexus" />
+		<test url="http://www.google.ca/patents" />
+		<test url="http://www.google.com/patents" />
+		<test url="http://www.google.com.au/patents" />
+		<test url="http://www.google.ca/policies" />
+		<test url="http://www.google.com/policies" />
+		<test url="http://www.google.com.au/policies" />
+		<test url="http://www.google.ca/prdhp" />
+		<test url="http://www.google.com/prdhp" />
+		<test url="http://www.google.com.au/prdhp" />
+		<test url="http://www.google.ca/profiles" />
+		<test url="http://www.google.com/profiles" />
+		<test url="http://www.google.com.au/profiles" />
+		<test url="http://www.google.ca/products" />
+		<test url="http://www.google.com/products" />
+		<test url="http://www.google.com.au/products" />
+		<test url="http://www.google.ca/reader" />
+		<test url="http://www.google.com/reader" />
+		<test url="http://www.google.com.au/reader" />
+		<test url="http://www.google.ca/s2" />
+		<test url="http://www.google.com/s2" />
+		<test url="http://www.google.com.au/s2" />
+		<test url="http://www.google.ca/script" />
+		<test url="http://www.google.com/script" />
+		<test url="http://www.google.com.au/script" />
+		<test url="http://www.google.ca/settings" />
+		<test url="http://www.google.com/settings" />
+		<test url="http://www.google.com.au/settings" />
+		<test url="http://www.google.ca/shopping" />
+		<test url="http://www.google.com/shopping" />
+		<test url="http://www.google.com.au/shopping" />
+		<test url="http://www.google.ca/support" />
+		<test url="http://www.google.com/support" />
+		<test url="http://www.google.com.au/support" />
+		<test url="http://www.google.ca/tisp" />
+		<test url="http://www.google.com/tisp" />
+		<test url="http://www.google.com.au/tisp" />
+		<test url="http://www.google.ca/tools" />
+		<test url="http://www.google.com/tools" />
+		<test url="http://www.google.com.au/tools" />
+		<test url="http://www.google.ca/transparencyreport" />
+		<test url="http://www.google.com/transparencyreport" />
+		<test url="http://www.google.com.au/transparencyreport" />
+		<test url="http://www.google.ca/trends" />
+		<test url="http://www.google.com/trends" />
+		<test url="http://www.google.com.au/trends" />
+		<test url="http://www.google.ca/urchin" />
+		<test url="http://www.google.com/urchin" />
+		<test url="http://www.google.com.au/urchin" />
+		<test url="http://www.google.ca/webmasters" />
+		<test url="http://www.google.com/webmasters" />
+		<test url="http://www.google.com.au/webmasters" />
+
+	<!-- Google CSE -->
 	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
 		 to="https://www.google.com/cse" />
+		<test url="http//www.google.ca/custom" />
+		<test url="http//www.google.com/custom" />
+		<test url="http//www.google.com.au/custom" />
 
 	<!--	Paths that only exist/work on .com
 							-->
@@ -484,4 +643,14 @@
 		<test url="http://bar.googlesource.com/" />
 		<test url="http://www.googlesource.com/" />
 
+	<!-- Problems -->
+		<!--	tisp$ 404s:
+					-->
+		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
+			to="https://www.google.$1/tisp/" />
+
+		<!--	Paths that 404 on .ccltd, but work on .com:
+									-->
+		<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
+			 to="https://www.google.com/" />
 </ruleset>

From 18b69fa7e0b4c8aadb57be50ac65a0f90d7d2a6d Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 14:36:15 +1100
Subject: [PATCH 13/77] [Google Services] Force https on the whole of
 www.googletagservices.com

---
 src/chrome/content/rules/GoogleServices.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 7ef83e92225d..503756bdc049 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -614,8 +614,8 @@
 
 	<!--	!www doesn't exist.
 					-->
-	<rule from="^http://www\.googletagservices\.com/tag/js/"
-		to="https://www.googletagservices.com/tag/js/" />
+	<rule from="^http://www\.googletagservices\.com/"
+		to="https://www.googletagservices.com/" />
 
 	<!-- subdomain to path redirects -->
 	<rule from="^http://(earth|trends)\.google\.com/"

From 05794eb957be111d0f7d83e0e07b9807fd7c6600 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 18:55:12 +1100
Subject: [PATCH 14/77] [Google Services] Fixed typo in lh\d test urls.

---
 src/chrome/content/rules/GoogleServices.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 503756bdc049..7b71f34b501a 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -273,10 +273,10 @@
 					-->
 	<rule from="^http://lh(\d)\.ggpht\.com/"
 		to="https://lh$1.ggpht.com/" />
-		<test url="http://ln3.ggpht.com/" />
-		<test url="http://ln4.ggpht.com/" />
-		<test url="http://ln5.ggpht.com/" />
-		<test url="http://ln6.ggpht.com/" />
+		<test url="http://lh3.ggpht.com/" />
+		<test url="http://lh4.ggpht.com/" />
+		<test url="http://lh5.ggpht.com/" />
+		<test url="http://lh6.ggpht.com/" />
 
 	<rule from="^http://(www\.)?goo\.gl/"
 		to="https://goo.gl/" />

From cd1499e582b640539954462c1211da6f7f60d37b Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 18:58:49 +1100
Subject: [PATCH 15/77] [Google Services] Added test urls for news.google.com

---
 src/chrome/content/rules/GoogleServices.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 7b71f34b501a..46ba89c66933 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -194,7 +194,13 @@
 	<target host="groups.google.*" />
 	<target host="it.google.*" />
 	<target host="news.google.*" />
-		<exclusion pattern="^http://(?:news\.)?google\.com?(?:\.[a-z][a-z])?/(?:archivesearch|newspapers)" />
+		<exclusion pattern="^http://(news\.)?google\.com?(?:\.[a-z][a-z])?/(archivesearch|newspapers)" />
+			<test url="http://news.google.ca/archivesearch" />
+			<test url="http://news.google.com/archivesearch" />
+			<test url="http://news.google.com.au/archivesearch" />
+			<test url="http://news.google.ca/newspapers" />
+			<test url="http://news.google.com/newspapers" />
+			<test url="http://news.google.com.au/newspapers" />
 	<target host="picasaweb.google.*" />
 	<target host="scholar.google.*" />
 	<target host="www.google.*" />
@@ -211,7 +217,7 @@
 	<target host="www.google.co.*" />
 	<target host="google.com" />
 	<target host="*.google.com" />
-		<exclusion pattern="^http://(?:www\.)?google\.com/analytics/*(?:/[^/]+)?(?:\?.*)?$" />
+		<exclusion pattern="^http://(www\.)?google\.com/analytics/*(?:/[^/]+)?(?:\?.*)?$" />
 		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
 		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
 	<target host="google.com.*" />

From 62ec6c02b72b8712ea678c03b9d9fcbcab1dcc61 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 19:06:46 +1100
Subject: [PATCH 16/77] [Google Services] Fixed typos in test urls ln->lh
 http// -> http://

---
 src/chrome/content/rules/GoogleServices.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 46ba89c66933..5179c7c4e43e 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -456,9 +456,9 @@
 	<!-- Google CSE -->
 	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
 		 to="https://www.google.com/cse" />
-		<test url="http//www.google.ca/custom" />
-		<test url="http//www.google.com/custom" />
-		<test url="http//www.google.com.au/custom" />
+		<test url="http://www.google.ca/custom" />
+		<test url="http://www.google.com/custom" />
+		<test url="http://www.google.com.au/custom" />
 
 	<!--	Paths that only exist/work on .com
 							-->
@@ -501,9 +501,9 @@
 		<test url="http://id.google.ca/" />
 		<test url="http://id.google.com/" />
 		<test url="http://id.google.com.au/" />
-		<test url="http://ln3.google.ca/" />
-		<test url="http://ln4.google.com/" />
-		<test url="http://ln5.google.com.au/" />
+		<test url="http://lh3.google.ca/" />
+		<test url="http://lh4.google.com/" />
+		<test url="http://lh5.google.com.au/" />
 		<test url="http://m.google.ca/" />
 		<test url="http://m.google.com/" />
 		<test url="http://m.google.com.au/" />

From af61e40cea87e574bd8d78aa8a768b69c38175b6 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 19:10:55 +1100
Subject: [PATCH 17/77] [Google Services] Fixed missing \. in googlesource.com
 rule

---
 src/chrome/content/rules/GoogleServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 5179c7c4e43e..912c1c4edd79 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -643,7 +643,7 @@
 		<test url="http://bar.googlecode.com/" />
 		<test url="http://www.googlecode.com/" />
 
-	<rule from="^http://([^@:\./]+)?googlesource\.com/"
+	<rule from="^http://([^@:\./]+\.)?googlesource\.com/"
 		to="https://$1googlesource.com/" />
 		<test url="http://foo.googlesource.com/" />
 		<test url="http://bar.googlesource.com/" />

From 8b273d2391fc12d15af67ecd428670b24ce5e08e Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 19:12:56 +1100
Subject: [PATCH 18/77] [Google Services] Widened scope for news.google.*
 exclusion

---
 src/chrome/content/rules/GoogleServices.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 912c1c4edd79..efe98124158e 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -194,7 +194,7 @@
 	<target host="groups.google.*" />
 	<target host="it.google.*" />
 	<target host="news.google.*" />
-		<exclusion pattern="^http://(news\.)?google\.com?(?:\.[a-z][a-z])?/(archivesearch|newspapers)" />
+		<exclusion pattern="^http://(news\.)?google\.((?:com?\.)?\w{2,3})/(archivesearch|newspapers)" />
 			<test url="http://news.google.ca/archivesearch" />
 			<test url="http://news.google.com/archivesearch" />
 			<test url="http://news.google.com.au/archivesearch" />

From 69c87f52c1fb954ba2866274f45c3697481377d1 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 16 Feb 2015 19:30:21 +1100
Subject: [PATCH 19/77] [Google Services] Moved Google CSE higher up so it is
 matched first.

---
 src/chrome/content/rules/GoogleServices.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index efe98124158e..5d0630fa25f2 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -289,6 +289,13 @@
 		<test url="http://www.goo.gl/" />
 		<test url="http://goo.gl/" />
 
+	<!-- Google CSE -->
+	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
+		 to="https://www.google.com/cse" />
+		<test url="http://www.google.ca/custom" />
+		<test url="http://www.google.com/custom" />
+		<test url="http://www.google.com.au/custom" />
+
 	<!--	Paths that work on all in google.*
 							-->
 	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
@@ -453,13 +460,6 @@
 		<test url="http://www.google.com/webmasters" />
 		<test url="http://www.google.com.au/webmasters" />
 
-	<!-- Google CSE -->
-	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
-		 to="https://www.google.com/cse" />
-		<test url="http://www.google.ca/custom" />
-		<test url="http://www.google.com/custom" />
-		<test url="http://www.google.com.au/custom" />
-
 	<!--	Paths that only exist/work on .com
 							-->
 	<rule from="^http://(www\.)?google\.com/"

From 6f71b275385839feaaee0e34e842c1bed6236016 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:25:54 +1100
Subject: [PATCH 20/77] [Google Services] Splitting Ruleset into one file for
 simple rules and one for complex rules

---
 .../content/rules/Google.com_Subdomains.xml   | 140 ++++++++++++++++++
 src/chrome/content/rules/GoogleServices.xml   | 102 -------------
 2 files changed, 140 insertions(+), 102 deletions(-)
 create mode 100644 src/chrome/content/rules/Google.com_Subdomains.xml

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
new file mode 100644
index 000000000000..ab44d34fd033
--- /dev/null
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -0,0 +1,140 @@
+<!--
+	Other Google rulesets:
+
+		- See GoogleServices.xml for the lsit
+
+	Nonfunctional domains:
+
+		- partnerpage.google.com *
+		- picasa.google.com *
+		- www.picasa.google.com ²
+		- safebrowsing.clients.google.com	(404, mismatched)
+		- (www.)googlesyndicatedsearch.com	(404; mismatched, CN: google.com)
+		- buttons.googlesyndication.com *
+
+	* 404, valid cert
+	² 404; mismatched, CN: www.google.com
+
+	Problematic domains:
+
+		- www.goo.gl		(404; mismatched, CN: *.google.com)
+
+		- www.news.google.ca ²
+
+		- google.com subdomains:
+
+			- cbks0 ****
+			- earth *
+			- gg		($ 404s)
+			- knoll *
+			- scholar **
+			- trends *
+
+	Partially covered domains:
+
+		- google.cctld subdomains:
+
+			- scholar	(→ www)
+
+		- google.com subdomains:
+
+			- (www.)
+			- cbks0		($ 404s)
+			- gg		($ 404s)
+			- news		(→ www)
+			- scholar	(→ www)
+
+	Need covering:
+		- google.com subdomains:
+
+			- *.corp
+			- docs\d
+			- \d.docs
+			- earth		(→ www)
+			- knoll		(→ knol)
+			- lh\d
+			- spreadsheets\d
+			- tbn2			(→ encrypted-tbn2)
+			- trends		(→ www)
+-->
+<ruleset name="Google.com Subdomains">
+	<!--   Subdomains that only exist/work on .com   -->
+	<target host="admin.google.com" />
+	<target host="apis.google.com" />
+	<target host="appengine.google.com" />
+	<target host="calendar.google.com" />
+	<target host="cast.google.com" />
+	<target host="cbks0.google.com" />
+	<target host="cert-test.sandbox.google.com" />
+	<target host="chat.google.com" />
+	<target host="checkout.google.com" />
+	<target host="chrome.google.com" />
+	<target host="clients.google.com" />
+		<target host="clients1.google.com" />
+		<target host="clients2.google.com" />
+		<target host="clients3.google.com" />
+	<target host="cloud.google.com" />
+	<target host="code.google.com" />
+	<target host="corp.google.com" />
+		<target host="login.corp.google.com" />
+		<target host="ideas.corp.google.com" />
+		<target host="discovery.corp.google.com" />
+	<target host="developers.google.com" />
+	<target host="dl.google.com" />
+	<target host="docs.google.com" />
+		<target host="docs1.google.com" />
+		<target host="docs2.google.com" />
+		<target host="docs3.google.com" />
+		<target host="1.docs.google.com" />
+		<target host="2.docs.google.com" />
+		<target host="3.docs.google.com" />
+	<target host="drive.google.com" />
+	<target host="encrypted.google.com" />
+		<target host="encrypted-tbn1.google.com" />
+		<target host="encrypted-tbn2.google.com" />
+		<target host="encrypted-tbn3.google.com" />
+	<target host="feedburner.google.com" />
+	<target host="feedproxy.google.com" />
+	<target host="fiber.google.com" />
+	<target host="fonts.google.com" />
+	<target host="gg.google.com" />
+	<target host="glass.google.com" />
+	<target host="goto.google.com" />
+	<target host="health.google.com" />
+	<target host="helpouts.google.com" />
+	<target host="history.google.com" />
+	<target host="talkgadget.google.com" />
+	<target host="hostedtalkgadget.google.com" />
+	<target host="investor.google.com" />
+	<target host="ipv4.google.com" />
+	<target host="knol.google.com" />
+	<target host="knoll.google.com" />
+	<target host="mail.google.com" />
+		<target host="chatenabled.mail.google.com" />
+	<target host="pack.google.com" />
+	<target host="pki.google.com" />
+	<target host="play.google.com" />
+	<target host="plus.google.com" />
+		<target host="plus.sandbox.google.com" />
+	<target host="plusone.google.com" />
+	<target host="productforums.google.com" />
+	<target host="profiles.google.com" />
+	<target host="safebrowsing-cache.google.com" />
+	<target host="sb-ssl.google.com" />
+	<target host="script.google.com" />
+	<target host="security.google.com" />
+	<target host="services.google.com" />
+	<target host="servicessites.google.com" />
+	<target host="sites.google.com" />
+	<target host="spreadsheets.google.com" />
+		<target host="spreadsheets1.google.com" />
+		<target host="spreadsheets2.google.com" />
+		<target host="spreadsheets3.google.com" />
+	<target host="support.google.com" />
+	<target host="talk.google.com" />
+	<target host="tools.google.com" />
+	<target host="wallet.google.com" />
+
+	<rule from="^http:"
+			to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 5d0630fa25f2..af768a2a237b 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -24,20 +24,6 @@
 		- WebM_Project.org.xml
 		- With_Google.com.xml
 
-
-	Nonfunctional domains:
-
-		- partnerpage.google.com *
-		- picasa.google.com *
-		- www.picasa.google.com ²
-		- safebrowsing.clients.google.com	(404, mismatched)
-		- (www.)googlesyndicatedsearch.com	(404; mismatched, CN: google.com)
-		- buttons.googlesyndication.com *
-
-	* 404, valid cert
-	² 404; mismatched, CN: www.google.com
-
-
 	Nonfunctional google.com paths:
 
 		- analytics	(redirects to http)
@@ -54,15 +40,6 @@
 
 		- www.news.google.ca ²
 
-		- google.com subdomains:
-
-			- cbks0 ****
-			- earth *
-			- gg		($ 404s)
-			- knoll *
-			- scholar **
-			- trends *
-
 		- news.google.cctld **
 		- scholar.google.cctld **
 		- *-opensocial.googleusercontent.com ***
@@ -80,14 +57,6 @@
 
 			- scholar	(→ www)
 
-		- google.com subdomains:
-
-			- (www.)
-			- cbks0		($ 404s)
-			- gg		($ 404s)
-			- news		(→ www)
-			- scholar	(→ www)
-
 		- *.googleusercontent.com	(*-opensocial excluded)
 
 
@@ -96,77 +65,6 @@
 		- lh[3-6].ggpht.com
 		- (www.)goo.gl		(www → ^)
 
-		- google.com subdomains:
-
-			- accounts
-			- admin
-			- adwords
-			- apis
-			- appengine
-			- calendar
-			- checkout
-			- chrome
-			- clients[12]
-			- cloud
-			- code
-			- *.corp
-			- developers
-			- dl
-			- docs
-			- docs\d
-			- \d.docs
-			- domains
-			- drive
-			- earth		(→ www)
-			- encrypted
-			- encrypted-tbn[123]
-			- feedburner
-			- feedproxy
-			- fiber
-			- finance
-			- glass
-			- goto
-			- groups
-			- health
-			- helpouts
-			- history
-			- hostedtalkgadget
-			- id
-			- investor
-			- ipv4
-			- knol
-			- knoll		(→ knol)
-			- lh\d
-			- m
-			- mail
-			- chatenabled.mail
-			- pack
-			- picasaweb
-			- pki
-			- play
-			- plus
-			- plusone
-			- productforums
-			- profiles
-			- safebrowsing-cache
-			- cert-test.sandbox
-			- plus.sandbox
-			- sb-ssl
-			- script
-			- security
-			- services
-			- servicessites
-			- sites
-			- spreadsheets
-			- spreadsheets\d
-			- support
-			- talk
-			- talkgadget
-			- tbn2			(→ encrypted-tbn2)
-			- tools
-			- trends		(→ www)
-			- wallet
-
 		- partner.googleadservices.com
 		- (www.)googlecode.com
 		- *.googlecode.com	(per-project subdomains)

From 5ddd4a618fb9d3b59f966b7d9a3683e7d06677bb Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:32:12 +1100
Subject: [PATCH 21/77] [Google Services] Removing redundant rules

---
 .../content/rules/Google.com_Subdomains.xml   |  3 +
 src/chrome/content/rules/GoogleServices.xml   | 81 -------------------
 2 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index ab44d34fd033..744bd0cdeddb 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -135,6 +135,9 @@
 	<target host="tools.google.com" />
 	<target host="wallet.google.com" />
 
+	<!-- More Complex Rules -->
+
+
 	<rule from="^http:"
 			to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index af768a2a237b..72403e639ccd 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -409,87 +409,6 @@
 		<test url="http://picasaweb.google.com/" />
 		<test url="http://picasaweb.google.com.au/" />
 
-	<!--	Subdomains that only exist/work on .com
-							-->
-	<rule from="^http://(admin|apis|appengine|calendar|cast|cbks0|chat|checkout|chrome|clients\d?|cloud|code|corp|[\w-]+\.corp|developers|dl|docs\d?|\d\.docs|drive|encrypted|encrypted-tbn[123]|feedburner|feedproxy|fiber|fonts|gg|glass|goto|health|helpouts|history|(?:hosted)?talkgadget|investor|ipv4|knoll?|(?:chatenabled\.)?mail|pack|pki|play|plus(?:\.sandbox)?|plusone|productforums|profiles|safebrowsing-cache|cert-test\.sandbox|sb-ssl|script|security|services|servicessites|sites|spreadsheets\d?|support|talk|tools|wallet)\.google\.com/"
-			to="https://$1.google.com/" />
-
-		<test url="http://admin.google.com/" />
-		<test url="http://apis.google.com/" />
-		<test url="http://appengine.google.com/" />
-		<test url="http://calendar.google.com/" />
-		<test url="http://cast.google.com/" />
-		<test url="http://cbks0.google.com/" />
-		<test url="http://chat.google.com/" />
-		<test url="http://checkout.google.com/" />
-		<test url="http://chrome.google.com/" />
-		<test url="http://clients.google.com/" />
-			<test url="http://clients1.google.com/" />
-			<test url="http://clients2.google.com/" />
-			<test url="http://clients3.google.com/" />
-		<test url="http://cloud.google.com/" />
-		<test url="http://code.google.com/" />
-		<test url="http://corp.google.com/" />
-			<test url="http://login.corp.google.com/" />
-			<test url="http://ideas.corp.google.com/" />
-			<test url="http://discovery.corp.google.com/" />
-		<test url="http://developers.google.com/" />
-		<test url="http://dl.google.com/" />
-		<test url="http://docs.google.com/" />
-			<test url="http://docs1.google.com/" />
-			<test url="http://docs2.google.com/" />
-			<test url="http://docs3.google.com/" />
-			<test url="http://1.docs.google.com/" />
-			<test url="http://2.docs.google.com/" />
-			<test url="http://3.docs.google.com/" />
-		<test url="http://drive.google.com/" />
-		<test url="http://encrypted.google.com/" />
-			<test url="http://encrypted-tbn1.google.com/" />
-			<test url="http://encrypted-tbn2.google.com/" />
-			<test url="http://encrypted-tbn3.google.com/" />
-		<test url="http://feedburner.google.com/" />
-		<test url="http://feedproxy.google.com/" />
-		<test url="http://fiber.google.com/" />
-		<test url="http://fonts.google.com/" />
-		<test url="http://gg.google.com/" />
-		<test url="http://glass.google.com/" />
-		<test url="http://goto.google.com/" />
-		<test url="http://health.google.com/" />
-		<test url="http://helpouts.google.com/" />
-		<test url="http://history.google.com/" />
-		<test url="http://talkgadget.google.com/" />
-		<test url="http://hostedtalkgadget.google.com/" />
-		<test url="http://investor.google.com/" />
-		<test url="http://ipv4.google.com/" />
-		<test url="http://knol.google.com/" />
-		<test url="http://knoll.google.com/" />
-		<test url="http://mail.google.com/" />
-			<test url="http://chatenabled.mail.google.com/" />
-		<test url="http://pack.google.com/" />
-		<test url="http://pki.google.com/" />
-		<test url="http://play.google.com/" />
-		<test url="http://plus.google.com/" />
-			<test url="http://plus.sandbox.google.com/" />
-		<test url="http://plusone.google.com/" />
-		<test url="http://productforums.google.com/" />
-		<test url="http://profiles.google.com/" />
-		<test url="http://safebrowsing-cache.google.com/" />
-		<test url="http://cert-test.sandbox.google.com/" />
-		<test url="http://sb-ssl.google.com/" />
-		<test url="http://script.google.com/" />
-		<test url="http://security.google.com/" />
-		<test url="http://services.google.com/" />
-		<test url="http://servicessites.google.com/" />
-		<test url="http://sites.google.com/" />
-		<test url="http://spreadsheets.google.com/" />
-			<test url="http://spreadsheets1.google.com/" />
-			<test url="http://spreadsheets2.google.com/" />
-			<test url="http://spreadsheets3.google.com/" />
-		<test url="http://support.google.com/" />
-		<test url="http://talk.google.com/" />
-		<test url="http://tools.google.com/" />
-		<test url="http://wallet.google.com/" />
-
 	<!-- This is needed for OCSP responder to work.
 	If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
 		-->

From f83d6c4a3efd1a0e6929d74f7f22cbff9b8797d9 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:39:44 +1100
Subject: [PATCH 22/77] [Google.com Subdomains] Added complex rules for those
 that can't be covered by the default

---
 .../content/rules/Google.com_Subdomains.xml   | 42 ++++++++++++-------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 744bd0cdeddb..05a6f5e28120 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -70,24 +70,31 @@
 	<target host="checkout.google.com" />
 	<target host="chrome.google.com" />
 	<target host="clients.google.com" />
-		<target host="clients1.google.com" />
-		<target host="clients2.google.com" />
-		<target host="clients3.google.com" />
+		<target host="clients*.google.com" />
+		<!-- See the complex rule section -->
+			<test url="http://clients1.google.com/" />
+			<test url="http://clients2.google.com/" />
+			<test url="http://clients3.google.com/" />
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
 	<target host="corp.google.com" />
-		<target host="login.corp.google.com" />
-		<target host="ideas.corp.google.com" />
-		<target host="discovery.corp.google.com" />
+		<target host="*.corp.google.com" />
+		<!-- See the complex rule section -->
+			<test url="http://login.corp.google.com/" />
+			<test url="http://ideas.corp.google.com/" />
+			<test url="http://discovery.corp.google.com/" />
 	<target host="developers.google.com" />
 	<target host="dl.google.com" />
 	<target host="docs.google.com" />
-		<target host="docs1.google.com" />
-		<target host="docs2.google.com" />
-		<target host="docs3.google.com" />
-		<target host="1.docs.google.com" />
-		<target host="2.docs.google.com" />
-		<target host="3.docs.google.com" />
+	<!-- See the complex rule section -->
+		<target host="docs*.google.com" />
+			<test url="http://docs1.google.com/" />
+			<test url="http://docs2.google.com/" />
+			<test url="http://docs3.google.com/" />
+		<target host="*.docs.google.com" />
+			<test url="http://1.docs.google.com/" />
+			<test url="http://2.docs.google.com/" />
+			<test url="http://3.docs.google.com/" />
 	<target host="drive.google.com" />
 	<target host="encrypted.google.com" />
 		<target host="encrypted-tbn1.google.com" />
@@ -127,16 +134,19 @@
 	<target host="servicessites.google.com" />
 	<target host="sites.google.com" />
 	<target host="spreadsheets.google.com" />
-		<target host="spreadsheets1.google.com" />
-		<target host="spreadsheets2.google.com" />
-		<target host="spreadsheets3.google.com" />
+		<target host="spreadsheets*.google.com" />
+		<!-- See the complex rule section -->
+			<test url="http://spreadsheets1.google.com/" />
+			<test url="http://spreadsheets2.google.com/" />
+			<test url="http://spreadsheets3.google.com/" />
 	<target host="support.google.com" />
 	<target host="talk.google.com" />
 	<target host="tools.google.com" />
 	<target host="wallet.google.com" />
 
 	<!-- More Complex Rules -->
-
+	<rule from="^http://(clients\d|[\w-]+\.corp|docs\d|\d\.docs|spreadsheets\d)\.google\.com/"
+			to="https://$1.google.com/" />
 
 	<rule from="^http:"
 			to="https:" />

From 7b0ba18d3fddc5a6fed1b1aa5103f473c8005307 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:40:14 +1100
Subject: [PATCH 23/77] [Google.com Subdomains] Added slides.google.com

---
 src/chrome/content/rules/Google.com_Subdomains.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 05a6f5e28120..41f14e962c99 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -133,6 +133,7 @@
 	<target host="services.google.com" />
 	<target host="servicessites.google.com" />
 	<target host="sites.google.com" />
+	<target host="slides.google.com" />
 	<target host="spreadsheets.google.com" />
 		<target host="spreadsheets*.google.com" />
 		<!-- See the complex rule section -->

From f273c55ae698d817dc42fab9d8338fd54abc0fed Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:44:07 +1100
Subject: [PATCH 24/77] [Google Services & Google.com Subdomains] Removed
 unnecessary rules, moved rule.

---
 src/chrome/content/rules/Google.com_Subdomains.xml | 13 ++++++-------
 src/chrome/content/rules/GoogleServices.xml        |  6 ------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 41f14e962c99..2e63b22d9949 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -47,14 +47,7 @@
 	Need covering:
 		- google.com subdomains:
 
-			- *.corp
-			- docs\d
-			- \d.docs
 			- earth		(→ www)
-			- knoll		(→ knol)
-			- lh\d
-			- spreadsheets\d
-			- tbn2			(→ encrypted-tbn2)
 			- trends		(→ www)
 -->
 <ruleset name="Google.com Subdomains">
@@ -149,6 +142,12 @@
 	<rule from="^http://(clients\d|[\w-]+\.corp|docs\d|\d\.docs|spreadsheets\d)\.google\.com/"
 			to="https://$1.google.com/" />
 
+	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
+		to="https://encrypted-tbn$1.google.com/" />
+		<test url="http://tbn2.google.com/" />
+		<test url="http://encrypted-tbn2.google.com/" />
+		<test url="http://tbn1.google.com/" />
+
 	<rule from="^http:"
 			to="https:" />
 </ruleset>
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 72403e639ccd..5b013b1488cb 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -420,12 +420,6 @@
 		<test url="http://scholar.google.com/intl/" />
 		<test url="http://scholar.google.com.au/intl/" />
 
-	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
-		to="https://encrypted-tbn$1.google.com/" />
-		<test url="http://tbn2.google.com/" />
-		<test url="http://encrypted-tbn2.google.com/" />
-		<test url="http://tbn1.google.com/" />
-
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 

From 317bb5b5719a22c135afa1903946639fee539e43 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:49:46 +1100
Subject: [PATCH 25/77] [Google Services] Moving simple rules into
 GoogleServices_Simple.xml

---
 .../content/rules/Google.com_Subdomains.xml   |  2 +-
 src/chrome/content/rules/GoogleServices.xml   | 13 ++-----------
 .../content/rules/GoogleServices_Simple.xml   | 19 +++++++++++++++++++
 3 files changed, 22 insertions(+), 12 deletions(-)
 create mode 100644 src/chrome/content/rules/GoogleServices_Simple.xml

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 2e63b22d9949..e746736cc558 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -1,7 +1,7 @@
 <!--
 	Other Google rulesets:
 
-		- See GoogleServices.xml for the lsit
+		- See GoogleServices.xml for the list
 
 	Nonfunctional domains:
 
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 5b013b1488cb..3d94aea253c4 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -10,10 +10,12 @@
 		- Doubleclick.net.xml
 		- FeedBurner.xml
 		- Go_Lang.org.xml
+		- Google.com_Subdomains.xml
 		- Google.org.xml
 		- GoogleAPIs.xml
 		- Google_App_Engine.xml
 		- GoogleImages.xml
+		- GoogleServices_Simple.xml (Simple rules that normally would reside here are in this ruleset)
 		- GoogleShopping.xml
 		- Ingress.xml
 		- Made_with_Code.com.xml
@@ -423,17 +425,6 @@
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 
-	<rule from="^http://partner\.googleadservices\.com/"
-		 to="https://partner.googleadservices.com/" />
-
-	<rule from="^http://(pagead2|tpc)\.googlesyndication\.com/"
-		 to="https://$1.googlesyndication.com/" />
-
-	<!--	!www doesn't exist.
-					-->
-	<rule from="^http://www\.googletagservices\.com/"
-		to="https://www.googletagservices.com/" />
-
 	<!-- subdomain to path redirects -->
 	<rule from="^http://(earth|trends)\.google\.com/"
 		 to="https://www.google.com/$1" />
diff --git a/src/chrome/content/rules/GoogleServices_Simple.xml b/src/chrome/content/rules/GoogleServices_Simple.xml
new file mode 100644
index 000000000000..f033929013e0
--- /dev/null
+++ b/src/chrome/content/rules/GoogleServices_Simple.xml
@@ -0,0 +1,19 @@
+<!--
+	Rules that are simple to write go in here, for everything else
+	See GoogleServices.xml
+
+	Other Google rulesets:
+
+		- See GoogleServices.xml for the list
+-->
+<ruleset name="Google Services Simple">
+	<target host="partner.googleadservices.com" />
+	<target host="pagead2.googlesyndication.com" />
+	<target host="tpc.googlesyndication.com" />
+	
+	<!-- !www doesn't exist -->
+	<target host="www.googletagservices.com" />
+
+	<rule from="^http:"
+			to="https:" />
+</ruleset>
\ No newline at end of file

From b42b70e0d404f16a8cded47b6c722c8885572bfe Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 10:58:35 +1100
Subject: [PATCH 26/77] [Google Services & Google Services Simple] Moved Gmail
 into Simple

---
 src/chrome/content/rules/GoogleServices.xml        | 12 ------------
 src/chrome/content/rules/GoogleServices_Simple.xml | 13 ++++++++++++-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 3d94aea253c4..306324fa4da8 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -160,18 +160,6 @@
 	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
 	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
 	<securecookie host="^mail-attachment\.googleusercontent\.com$" name=".+" />
-	<securecookie host="^gmail\.com$" name=".+" />
-	<securecookie host="^www\.gmail\.com$" name=".+" />
-	<securecookie host="^googlemail\.com$" name=".+" />
-	<securecookie host="^www\.googlemail\.com$" name=".+" />
-
-	<!-- Gmail -->
-	<rule from="^http://(www\.)?g(oogle)?mail\.com/"
-		to="https://$1g$2mail.com/" />
-		<test url="http://www.gmail.com/" />
-		<test url="http://www.googlemail.com/" />
-		<test url="http://gmail.com/" />
-		<test url="http://googlemail.com/" />
 
 	<!--    - lh 3-6 exist
 		- All appear identical
diff --git a/src/chrome/content/rules/GoogleServices_Simple.xml b/src/chrome/content/rules/GoogleServices_Simple.xml
index f033929013e0..4ad0db79e691 100644
--- a/src/chrome/content/rules/GoogleServices_Simple.xml
+++ b/src/chrome/content/rules/GoogleServices_Simple.xml
@@ -10,7 +10,18 @@
 	<target host="partner.googleadservices.com" />
 	<target host="pagead2.googlesyndication.com" />
 	<target host="tpc.googlesyndication.com" />
-	
+
+	<!-- Gmail -->
+	<target host="gmail.com" />
+		<target host="www.gmail.com" />
+	<target host="googlemail.com" />
+		<target host="www.googlemail.com" />
+	<securecookie host="^gmail\.com$" name=".+" />
+	<securecookie host="^www\.gmail\.com$" name=".+" />
+	<securecookie host="^googlemail\.com$" name=".+" />
+	<securecookie host="^www\.googlemail\.com$" name=".+" />
+
+
 	<!-- !www doesn't exist -->
 	<target host="www.googletagservices.com" />
 

From d3105d34ca5ee4ebd8abecd832e62e0eeb903c8e Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:05:01 +1100
Subject: [PATCH 27/77] Moved OCSP exception to Google Services Simple.
 Clarified TISP

---
 .../content/rules/Google.com_Subdomains.xml       |  4 ++++
 src/chrome/content/rules/GoogleServices.xml       | 15 +++++++++------
 .../content/rules/GoogleServices_Simple.xml       |  1 -
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index e746736cc558..610feecfc87b 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -68,6 +68,10 @@
 			<test url="http://clients1.google.com/" />
 			<test url="http://clients2.google.com/" />
 			<test url="http://clients3.google.com/" />
+			<!-- This is needed for OCSP responder to work.
+				If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
+			-->
+			<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
 	<target host="corp.google.com" />
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 306324fa4da8..0c3d11e2580a 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -399,11 +399,6 @@
 		<test url="http://picasaweb.google.com/" />
 		<test url="http://picasaweb.google.com.au/" />
 
-	<!-- This is needed for OCSP responder to work.
-	If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
-		-->
-	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
-
 	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
 		to="https://www.google.$1/intl/" />
 		<test url="http://scholar.google.ca/intl/" />
@@ -440,10 +435,18 @@
 		<test url="http://www.googlesource.com/" />
 
 	<!-- Problems -->
-		<!--	tisp$ 404s:
+		<!--
+			https://www.google.com.au/tisp/	200 (OK)
+			https://www.google.com.au/tisp	404
+			https://www.google.com/tisp		404
+			http://www.google.com/tisp		301 (redirect)
 					-->
 		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
 			to="https://www.google.$1/tisp/" />
+			<test url="https://www.google.com.au/tisp/" />
+			<test url="https://www.google.com.au/tisp" />
+			<test url="https://www.google.com/tisp" />
+			<test url="http://www.google.com/tisp" />
 
 		<!--	Paths that 404 on .ccltd, but work on .com:
 									-->
diff --git a/src/chrome/content/rules/GoogleServices_Simple.xml b/src/chrome/content/rules/GoogleServices_Simple.xml
index 4ad0db79e691..79ed76e7cb01 100644
--- a/src/chrome/content/rules/GoogleServices_Simple.xml
+++ b/src/chrome/content/rules/GoogleServices_Simple.xml
@@ -21,7 +21,6 @@
 	<securecookie host="^googlemail\.com$" name=".+" />
 	<securecookie host="^www\.googlemail\.com$" name=".+" />
 
-
 	<!-- !www doesn't exist -->
 	<target host="www.googletagservices.com" />
 

From d966844b57c41fa29792ac2c6893fd28cce04f75 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:07:14 +1100
Subject: [PATCH 28/77] [Google Services] More tests

---
 src/chrome/content/rules/GoogleServices.xml | 38 ++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 0c3d11e2580a..24a5b0a2714b 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -451,5 +451,41 @@
 		<!--	Paths that 404 on .ccltd, but work on .com:
 									-->
 		<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
-			 to="https://www.google.com/" />
+			 	to="https://www.google.com/" />
+			<test url="http://www.google.ca/calendar" />
+			<test url="http://www.google.com/calendar" />
+			<test url="http://www.google.com.au/calendar" />
+			<test url="http://www.google.ca/dictionary" />
+			<test url="http://www.google.com/dictionary" />
+			<test url="http://www.google.com.au/dictionary" />
+			<test url="http://www.google.ca/doubleclick" />
+			<test url="http://www.google.com/doubleclick" />
+			<test url="http://www.google.com.au/doubleclick" />
+			<test url="http://www.google.ca/foobar" />
+			<test url="http://www.google.com/foobar" />
+			<test url="http://www.google.com.au/foobar" />
+			<test url="http://www.google.ca/help" />
+			<test url="http://www.google.com/help" />
+			<test url="http://www.google.com.au/help" />
+			<test url="http://www.google.ca/ideas" />
+			<test url="http://www.google.com/ideas" />
+			<test url="http://www.google.com.au/ideas" />
+			<test url="http://www.google.ca/pacman" />
+			<test url="http://www.google.com/pacman" />
+			<test url="http://www.google.com.au/pacman" />
+			<test url="http://www.google.ca/partners" />
+			<test url="http://www.google.com/partners" />
+			<test url="http://www.google.com.au/partners" />
+			<test url="http://www.google.ca/postini" />
+			<test url="http://www.google.com/postini" />
+			<test url="http://www.google.com.au/postini" />
+			<test url="http://www.google.ca/powermeter" />
+			<test url="http://www.google.com/powermeter" />
+			<test url="http://www.google.com.au/powermeter" />
+			<test url="http://www.google.ca/url" />
+			<test url="http://www.google.com/url" />
+			<test url="http://www.google.com.au/url" />
+			<test url="http://www.google.ca/webdesigner" />
+			<test url="http://www.google.com/webdesigner" />
+			<test url="http://www.google.com.au/webdesigner" />
 </ruleset>

From 2b7026ab8c8bbc3ec5e8b198e77d030e23105703 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:13:38 +1100
Subject: [PATCH 29/77] [Google Services] Added test urls for open social
 exception

---
 src/chrome/content/rules/GoogleServices.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 24a5b0a2714b..9b2932a86e11 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -147,6 +147,9 @@
 				 https://trac.torproject.org/projects/tor/ticket/7294
 											-->
 		<exclusion pattern="http://[^@:\./]+-opensocial\.googleusercontent\.com" />
+			<test url="http://foo-opensocial.googleusercontent.com" />
+			<test url="http://bar-opensocial.googleusercontent.com" />
+			<test url="http://foobar-opensocial.googleusercontent.com" />
 
 
 	<!--	Not secured by server:

From c99c64f3b8f2b761982176f70acbbf6769845b5d Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:18:52 +1100
Subject: [PATCH 30/77] Added tests for OCSP responder exception and removed
 unused targets from Google Services

---
 src/chrome/content/rules/Google.com_Subdomains.xml | 3 +++
 src/chrome/content/rules/GoogleServices.xml        | 8 --------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 610feecfc87b..1eab530f19f5 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -72,6 +72,9 @@
 				If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
 			-->
 			<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
+				<test url="http://clients1.google.com/ocsp" />
+				<test url="http://clients2.google.com/ocsp" />
+				<test url="http://clients3.google.com/ocsp" />
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
 	<target host="corp.google.com" />
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 9b2932a86e11..75031fd85be5 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -83,8 +83,6 @@
 -->
 <ruleset name="Google Services">
 	<target host="*.ggpht.com" />
-	<target host="gmail.com" />
-	<target host="www.gmail.com" />
 	<target host="goo.gl" />
 	<target host="www.goo.gl" />
 	<target host="google.*" />
@@ -129,16 +127,11 @@
 	<target host="picasaweb.google.com.*" />
 	<target host="scholar.google.com.*" />
 	<target host="www.google.com.*" />
-	<target host="partner.googleadservices.com" />
 	<target host="googlecode.com" />
 	<target host="*.googlecode.com" />
-	<target host="googlemail.com" />
-	<target host="www.googlemail.com" />
 	<target host="googlesource.com" />
 	<target host="*.googlesource.com" />
 	<target host="*.googlesyndication.com" />
-	<target host="www.googletagservices.com" />
-	<!--target host="googleusercontent.com" doesn't work /-->
 	<target host="*.googleusercontent.com" />
 	<target host="*.corp.googleusercontent.com" />
 		<!--
@@ -446,7 +439,6 @@
 					-->
 		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
 			to="https://www.google.$1/tisp/" />
-			<test url="https://www.google.com.au/tisp/" />
 			<test url="https://www.google.com.au/tisp" />
 			<test url="https://www.google.com/tisp" />
 			<test url="http://www.google.com/tisp" />

From e6c039b70e7f7dedf6da8328f827825aea85c790 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:25:43 +1100
Subject: [PATCH 31/77] [Google Services] Removed redundant rule, added more
 tests

---
 src/chrome/content/rules/GoogleServices.xml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 75031fd85be5..b4a2664c51ac 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -176,6 +176,9 @@
 	<!-- Google CSE -->
 	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
 		 to="https://www.google.com/cse" />
+		<test url="http://google.ca/custom" />
+		<test url="http://google.com/custom" />
+		<test url="http://google.com.au/custom" />
 		<test url="http://www.google.ca/custom" />
 		<test url="http://www.google.com/custom" />
 		<test url="http://www.google.com.au/custom" />
@@ -346,8 +349,9 @@
 
 	<!--	Paths that only exist/work on .com
 							-->
-	<rule from="^http://(www\.)?google\.com/"
-			to="https://www.google.com/" />
+	<!-- covered in above rule
+		rule from="^http://(www\.)?google\.com/"
+			to="https://www.google.com/" /-->
 		<test url="http://google.com/" />
 		<test url="http://www.google.com/" />
 		<test url="http://www.google.com/+" />

From f694fd2687a524591833629217e67ea849564e0d Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:29:57 +1100
Subject: [PATCH 32/77] [Google Services] Changed Ordering of rules, to allow
 more specialised rules to work.

---
 src/chrome/content/rules/GoogleServices.xml | 237 ++++++++++----------
 1 file changed, 119 insertions(+), 118 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index b4a2664c51ac..6a93f0fe4c8c 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -183,7 +183,126 @@
 		<test url="http://www.google.com/custom" />
 		<test url="http://www.google.com.au/custom" />
 
+	<!--	Subdomains that work on all in google.*
+							-->
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
+		to="https://$1.google.$2/" />
+		<test url="http://accounts.google.ca/" />
+		<test url="http://accounts.google.com/" />
+		<test url="http://accounts.google.com.au/" />
+		<test url="http://adwords.google.ca/" />
+		<test url="http://adwords.google.com/" />
+		<test url="http://adwords.google.com.au/" />
+		<test url="http://finance.google.ca/" />
+		<test url="http://finance.google.com/" />
+		<test url="http://finance.google.com.au/" />
+		<test url="http://groups.google.ca/" />
+		<test url="http://groups.google.com/" />
+		<test url="http://groups.google.com.au/" />
+		<test url="http://id.google.ca/" />
+		<test url="http://id.google.com/" />
+		<test url="http://id.google.com.au/" />
+		<test url="http://lh3.google.ca/" />
+		<test url="http://lh4.google.com/" />
+		<test url="http://lh5.google.com.au/" />
+		<test url="http://m.google.ca/" />
+		<test url="http://m.google.com/" />
+		<test url="http://m.google.com.au/" />
+		<test url="http://picasaweb.google.ca/" />
+		<test url="http://picasaweb.google.com/" />
+		<test url="http://picasaweb.google.com.au/" />
+
+	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
+		to="https://www.google.$1/intl/" />
+		<test url="http://scholar.google.ca/intl/" />
+		<test url="http://scholar.google.com/intl/" />
+		<test url="http://scholar.google.com.au/intl/" />
+
+	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
+		to="https://www.google.com/news" />
+
+	<!-- subdomain to path redirects -->
+	<rule from="^http://(earth|trends)\.google\.com/"
+		 to="https://www.google.com/$1" />
+		<test url="http://earth.google.com/" />
+		<test url="http://trends.google.com/" />
+
+	<!-- wildcards -->
+
+	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
+		to="https://$1.googleusercontent.com/" />
+		<test url="http://webcache.googleusercontent.com/" />
+		<test url="http://foo.googleusercontent.com/" />
+		<test url="http://bar.googleusercontent.com/" />
+
+	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
+		 to="https://$1googlecode.com/" />
+		<test url="http://foo.googlecode.com/" />
+		<test url="http://bar.googlecode.com/" />
+		<test url="http://www.googlecode.com/" />
+
+	<rule from="^http://([^@:\./]+\.)?googlesource\.com/"
+		to="https://$1googlesource.com/" />
+		<test url="http://foo.googlesource.com/" />
+		<test url="http://bar.googlesource.com/" />
+		<test url="http://www.googlesource.com/" />
+
+	<!-- Problems -->
+		<!--
+			https://www.google.com.au/tisp/	200 (OK)
+			https://www.google.com.au/tisp	404
+			https://www.google.com/tisp		404
+			http://www.google.com/tisp		301 (redirect)
+					-->
+		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
+			to="https://www.google.$1/tisp/" />
+			<test url="https://www.google.com.au/tisp" />
+			<test url="https://www.google.com/tisp" />
+			<test url="http://www.google.com/tisp" />
+
+		<!--	Paths that 404 on .ccltd, but work on .com:
+									-->
+		<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
+			 	to="https://www.google.com/" />
+			<test url="http://www.google.ca/calendar" />
+			<test url="http://www.google.com/calendar" />
+			<test url="http://www.google.com.au/calendar" />
+			<test url="http://www.google.ca/dictionary" />
+			<test url="http://www.google.com/dictionary" />
+			<test url="http://www.google.com.au/dictionary" />
+			<test url="http://www.google.ca/doubleclick" />
+			<test url="http://www.google.com/doubleclick" />
+			<test url="http://www.google.com.au/doubleclick" />
+			<test url="http://www.google.ca/foobar" />
+			<test url="http://www.google.com/foobar" />
+			<test url="http://www.google.com.au/foobar" />
+			<test url="http://www.google.ca/help" />
+			<test url="http://www.google.com/help" />
+			<test url="http://www.google.com.au/help" />
+			<test url="http://www.google.ca/ideas" />
+			<test url="http://www.google.com/ideas" />
+			<test url="http://www.google.com.au/ideas" />
+			<test url="http://www.google.ca/pacman" />
+			<test url="http://www.google.com/pacman" />
+			<test url="http://www.google.com.au/pacman" />
+			<test url="http://www.google.ca/partners" />
+			<test url="http://www.google.com/partners" />
+			<test url="http://www.google.com.au/partners" />
+			<test url="http://www.google.ca/postini" />
+			<test url="http://www.google.com/postini" />
+			<test url="http://www.google.com.au/postini" />
+			<test url="http://www.google.ca/powermeter" />
+			<test url="http://www.google.com/powermeter" />
+			<test url="http://www.google.com.au/powermeter" />
+			<test url="http://www.google.ca/url" />
+			<test url="http://www.google.com/url" />
+			<test url="http://www.google.com.au/url" />
+			<test url="http://www.google.ca/webdesigner" />
+			<test url="http://www.google.com/webdesigner" />
+			<test url="http://www.google.com.au/webdesigner" />
+
 	<!--	Paths that work on all in google.*
+	(Keep this the final rule in the set)
 							-->
 	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
 		 to="https://www.google.$1/" />
@@ -369,122 +488,4 @@
 		<test url="http://www.google.com/safebrowsing" />
 		<test url="http://www.google.com/videotargetting" />
 		<test url="http://www.google.com/webfonts" />
-
-	<!--	Subdomains that work on all in google.*
-							-->
-	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
-		to="https://$1.google.$2/" />
-		<test url="http://accounts.google.ca/" />
-		<test url="http://accounts.google.com/" />
-		<test url="http://accounts.google.com.au/" />
-		<test url="http://adwords.google.ca/" />
-		<test url="http://adwords.google.com/" />
-		<test url="http://adwords.google.com.au/" />
-		<test url="http://finance.google.ca/" />
-		<test url="http://finance.google.com/" />
-		<test url="http://finance.google.com.au/" />
-		<test url="http://groups.google.ca/" />
-		<test url="http://groups.google.com/" />
-		<test url="http://groups.google.com.au/" />
-		<test url="http://id.google.ca/" />
-		<test url="http://id.google.com/" />
-		<test url="http://id.google.com.au/" />
-		<test url="http://lh3.google.ca/" />
-		<test url="http://lh4.google.com/" />
-		<test url="http://lh5.google.com.au/" />
-		<test url="http://m.google.ca/" />
-		<test url="http://m.google.com/" />
-		<test url="http://m.google.com.au/" />
-		<test url="http://picasaweb.google.ca/" />
-		<test url="http://picasaweb.google.com/" />
-		<test url="http://picasaweb.google.com.au/" />
-
-	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
-		to="https://www.google.$1/intl/" />
-		<test url="http://scholar.google.ca/intl/" />
-		<test url="http://scholar.google.com/intl/" />
-		<test url="http://scholar.google.com.au/intl/" />
-
-	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
-		to="https://www.google.com/news" />
-
-	<!-- subdomain to path redirects -->
-	<rule from="^http://(earth|trends)\.google\.com/"
-		 to="https://www.google.com/$1" />
-		<test url="http://earth.google.com/" />
-		<test url="http://trends.google.com/" />
-
-	<!-- wildcards -->
-
-	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
-		to="https://$1.googleusercontent.com/" />
-		<test url="http://webcache.googleusercontent.com/" />
-		<test url="http://foo.googleusercontent.com/" />
-		<test url="http://bar.googleusercontent.com/" />
-
-	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
-		 to="https://$1googlecode.com/" />
-		<test url="http://foo.googlecode.com/" />
-		<test url="http://bar.googlecode.com/" />
-		<test url="http://www.googlecode.com/" />
-
-	<rule from="^http://([^@:\./]+\.)?googlesource\.com/"
-		to="https://$1googlesource.com/" />
-		<test url="http://foo.googlesource.com/" />
-		<test url="http://bar.googlesource.com/" />
-		<test url="http://www.googlesource.com/" />
-
-	<!-- Problems -->
-		<!--
-			https://www.google.com.au/tisp/	200 (OK)
-			https://www.google.com.au/tisp	404
-			https://www.google.com/tisp		404
-			http://www.google.com/tisp		301 (redirect)
-					-->
-		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
-			to="https://www.google.$1/tisp/" />
-			<test url="https://www.google.com.au/tisp" />
-			<test url="https://www.google.com/tisp" />
-			<test url="http://www.google.com/tisp" />
-
-		<!--	Paths that 404 on .ccltd, but work on .com:
-									-->
-		<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
-			 	to="https://www.google.com/" />
-			<test url="http://www.google.ca/calendar" />
-			<test url="http://www.google.com/calendar" />
-			<test url="http://www.google.com.au/calendar" />
-			<test url="http://www.google.ca/dictionary" />
-			<test url="http://www.google.com/dictionary" />
-			<test url="http://www.google.com.au/dictionary" />
-			<test url="http://www.google.ca/doubleclick" />
-			<test url="http://www.google.com/doubleclick" />
-			<test url="http://www.google.com.au/doubleclick" />
-			<test url="http://www.google.ca/foobar" />
-			<test url="http://www.google.com/foobar" />
-			<test url="http://www.google.com.au/foobar" />
-			<test url="http://www.google.ca/help" />
-			<test url="http://www.google.com/help" />
-			<test url="http://www.google.com.au/help" />
-			<test url="http://www.google.ca/ideas" />
-			<test url="http://www.google.com/ideas" />
-			<test url="http://www.google.com.au/ideas" />
-			<test url="http://www.google.ca/pacman" />
-			<test url="http://www.google.com/pacman" />
-			<test url="http://www.google.com.au/pacman" />
-			<test url="http://www.google.ca/partners" />
-			<test url="http://www.google.com/partners" />
-			<test url="http://www.google.com.au/partners" />
-			<test url="http://www.google.ca/postini" />
-			<test url="http://www.google.com/postini" />
-			<test url="http://www.google.com.au/postini" />
-			<test url="http://www.google.ca/powermeter" />
-			<test url="http://www.google.com/powermeter" />
-			<test url="http://www.google.com.au/powermeter" />
-			<test url="http://www.google.ca/url" />
-			<test url="http://www.google.com/url" />
-			<test url="http://www.google.com.au/url" />
-			<test url="http://www.google.ca/webdesigner" />
-			<test url="http://www.google.com/webdesigner" />
-			<test url="http://www.google.com.au/webdesigner" />
 </ruleset>

From e62c71d5b36055b539e1c436612aa1cb10ea19b3 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 17 Feb 2015 11:36:57 +1100
Subject: [PATCH 33/77] [Google Services] Expanded test urls for /tisp

---
 src/chrome/content/rules/GoogleServices.xml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 6a93f0fe4c8c..d284f30bd389 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -256,9 +256,16 @@
 					-->
 		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
 			to="https://www.google.$1/tisp/" />
-			<test url="https://www.google.com.au/tisp" />
-			<test url="https://www.google.com/tisp" />
+			<test url="http://www.google.ca/tisp" />
 			<test url="http://www.google.com/tisp" />
+			<test url="http://www.google.com.au/tisp" />
+			<test url="https://www.google.ca/tisp" />
+			<test url="https://www.google.com/tisp" />
+			<test url="https://www.google.com.au/tisp" />
+			<test url="http://google.ca/tisp?" />
+			<test url="http://google.com/tisp?" />
+			<test url="http://google.com.au/tisp?" />
+
 
 		<!--	Paths that 404 on .ccltd, but work on .com:
 									-->
@@ -447,9 +454,6 @@
 		<test url="http://www.google.ca/support" />
 		<test url="http://www.google.com/support" />
 		<test url="http://www.google.com.au/support" />
-		<test url="http://www.google.ca/tisp" />
-		<test url="http://www.google.com/tisp" />
-		<test url="http://www.google.com.au/tisp" />
 		<test url="http://www.google.ca/tools" />
 		<test url="http://www.google.com/tools" />
 		<test url="http://www.google.com.au/tools" />

From c380d16c2012a2f868e3373f7a09cd61fa865532 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Wed, 18 Feb 2015 15:45:49 +1100
Subject: [PATCH 34/77] [Google Services Simple] Added googletagmanager.com

---
 src/chrome/content/rules/GoogleServices_Simple.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/GoogleServices_Simple.xml b/src/chrome/content/rules/GoogleServices_Simple.xml
index 79ed76e7cb01..ed14063cb473 100644
--- a/src/chrome/content/rules/GoogleServices_Simple.xml
+++ b/src/chrome/content/rules/GoogleServices_Simple.xml
@@ -11,6 +11,9 @@
 	<target host="pagead2.googlesyndication.com" />
 	<target host="tpc.googlesyndication.com" />
 
+	<target host="googletagmanager.com" />
+	<target host="www.googletagmanager.com" />
+
 	<!-- Gmail -->
 	<target host="gmail.com" />
 		<target host="www.gmail.com" />

From c9b6b46598c8c9852eadd6b07c0717c0542e0dac Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:16:28 +1100
Subject: [PATCH 35/77] [Google & Google Services] Further Split www.google.tld
 and google.tld into their own ruleset.

---
 src/chrome/content/rules/Google.xml         | 276 ++++++++++++++++++++
 src/chrome/content/rules/GoogleServices.xml | 273 -------------------
 2 files changed, 276 insertions(+), 273 deletions(-)
 create mode 100644 src/chrome/content/rules/Google.xml

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
new file mode 100644
index 000000000000..d49a2a0e6a3b
--- /dev/null
+++ b/src/chrome/content/rules/Google.xml
@@ -0,0 +1,276 @@
+<!--
+	This ruleset only overs (www.)?google.tld
+	Other Google rulesets:
+
+		- See GoogleServices.xml for the list
+
+	Nonfunctional google.com paths:
+
+		- analytics	(redirects to http)
+		- imgres
+		- gadgets *
+		- u/		(404)
+
+	* Redirects to http
+-->
+<ruleset name="Google">
+	<target host="google.*" />
+	<target host="www.google.*" />
+
+	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
+
+	<!-- Problems -->
+		<!--
+			https://www.google.com.au/tisp/	200 (OK)
+			https://www.google.com.au/tisp	404
+			https://www.google.com/tisp		404
+			http://www.google.com/tisp		301 (redirect)
+					-->
+		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
+			to="https://www.google.$1/tisp/" />
+			<test url="http://www.google.ca/tisp" />
+			<test url="http://www.google.com/tisp" />
+			<test url="http://www.google.com.au/tisp" />
+			<test url="https://www.google.ca/tisp" />
+			<test url="https://www.google.com/tisp" />
+			<test url="https://www.google.com.au/tisp" />
+			<test url="http://google.ca/tisp?" />
+			<test url="http://google.com/tisp?" />
+			<test url="http://google.com.au/tisp?" />
+	<!-- /problems -->
+
+	<!-- Google CSE -->
+	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
+		 to="https://www.google.com/cse" />
+		<test url="http://google.ca/custom" />
+		<test url="http://google.com/custom" />
+		<test url="http://google.com.au/custom" />
+		<test url="http://www.google.ca/custom" />
+		<test url="http://www.google.com/custom" />
+		<test url="http://www.google.com.au/custom" />
+	<!--	Paths that 404 on .ccltd, but work on .com:
+								-->
+	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
+		 	to="https://www.google.com/" />
+		<test url="http://www.google.ca/calendar" />
+		<test url="http://www.google.com/calendar" />
+		<test url="http://www.google.com.au/calendar" />
+		<test url="http://www.google.ca/dictionary" />
+		<test url="http://www.google.com/dictionary" />
+		<test url="http://www.google.com.au/dictionary" />
+		<test url="http://www.google.ca/doubleclick" />
+		<test url="http://www.google.com/doubleclick" />
+		<test url="http://www.google.com.au/doubleclick" />
+		<test url="http://www.google.ca/foobar" />
+		<test url="http://www.google.com/foobar" />
+		<test url="http://www.google.com.au/foobar" />
+		<test url="http://www.google.ca/help" />
+		<test url="http://www.google.com/help" />
+		<test url="http://www.google.com.au/help" />
+		<test url="http://www.google.ca/ideas" />
+		<test url="http://www.google.com/ideas" />
+		<test url="http://www.google.com.au/ideas" />
+		<test url="http://www.google.ca/pacman" />
+		<test url="http://www.google.com/pacman" />
+		<test url="http://www.google.com.au/pacman" />
+		<test url="http://www.google.ca/partners" />
+		<test url="http://www.google.com/partners" />
+		<test url="http://www.google.com.au/partners" />
+		<test url="http://www.google.ca/postini" />
+		<test url="http://www.google.com/postini" />
+		<test url="http://www.google.com.au/postini" />
+		<test url="http://www.google.ca/powermeter" />
+		<test url="http://www.google.com/powermeter" />
+		<test url="http://www.google.com.au/powermeter" />
+		<test url="http://www.google.ca/url" />
+		<test url="http://www.google.com/url" />
+		<test url="http://www.google.com.au/url" />
+		<test url="http://www.google.ca/webdesigner" />
+		<test url="http://www.google.com/webdesigner" />
+		<test url="http://www.google.com.au/webdesigner" />
+
+<!--	Paths that work on all in google.*
+(Keep this the final rule in the set)
+						-->
+<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
+	 to="https://www.google.$1/" />
+	<test url="http://www.google.ca/accounts" />
+	<test url="http://www.google.com/accounts" />
+	<test url="http://www.google.com.au/accounts" />
+	<test url="http://www.google.ca/adplanner" />
+	<test url="http://www.google.com/adplanner" />
+	<test url="http://www.google.com.au/adplanner" />
+	<test url="http://www.google.ca/ads" />
+	<test url="http://www.google.com/ads" />
+	<test url="http://www.google.com.au/ads" />
+	<test url="http://www.google.ca/adsense" />
+	<test url="http://www.google.com/adsense" />
+	<test url="http://www.google.com.au/adsense" />
+	<test url="http://www.google.ca/adwords" />
+	<test url="http://www.google.com/adwords" />
+	<test url="http://www.google.com.au/adwords" />
+	<test url="http://www.google.ca/analytics" />
+	<test url="http://www.google.com/analytics" />
+	<test url="http://www.google.com.au/analytics" />
+	<test url="http://www.google.ca/bookmarks" />
+	<test url="http://www.google.com/bookmarks" />
+	<test url="http://www.google.com.au/bookmarks" />
+	<test url="http://www.google.ca/books" />
+	<test url="http://www.google.com/books" />
+	<test url="http://www.google.com.au/books" />
+	<test url="http://www.google.ca/chrome" />
+	<test url="http://www.google.com/chrome" />
+	<test url="http://www.google.com.au/chrome" />
+	<test url="http://www.google.ca/chromecast" />
+	<test url="http://www.google.com/chromecast" />
+	<test url="http://www.google.com.au/chromecast" />
+	<test url="http://www.google.ca/contacts" />
+	<test url="http://www.google.com/contacts" />
+	<test url="http://www.google.com.au/contacts" />
+	<test url="http://www.google.ca/coop" />
+	<test url="http://www.google.com/coop" />
+	<test url="http://www.google.com.au/coop" />
+	<test url="http://www.google.ca/cse" />
+	<test url="http://www.google.com/cse" />
+	<test url="http://www.google.com.au/cse" />
+	<test url="http://www.google.ca/css" />
+	<test url="http://www.google.com/css" />
+	<test url="http://www.google.com.au/css" />
+	<test url="http://www.google.ca/culturalinstitute" />
+	<test url="http://www.google.com/culturalinstitute" />
+	<test url="http://www.google.com.au/culturalinstitute" />
+	<test url="http://www.google.ca/doodles" />
+	<test url="http://www.google.com/doodles" />
+	<test url="http://www.google.com.au/doodles" />
+	<test url="http://www.google.ca/earth" />
+	<test url="http://www.google.com/earth" />
+	<test url="http://www.google.com.au/earth" />
+	<test url="http://www.google.ca/favicon.ico" />
+	<test url="http://www.google.com/favicon.ico" />
+	<test url="http://www.google.com.au/favicon.ico" />
+	<test url="http://www.google.ca/finance" />
+	<test url="http://www.google.com/finance" />
+	<test url="http://www.google.com.au/finance" />
+	<test url="http://www.google.ca/get" />
+	<test url="http://www.google.com/get" />
+	<test url="http://www.google.com.au/get" />
+	<test url="http://www.google.ca/goodtoknow" />
+	<test url="http://www.google.com/goodtoknow" />
+	<test url="http://www.google.com.au/goodtoknow" />
+	<test url="http://www.google.ca/googleblogs" />
+	<test url="http://www.google.com/googleblogs" />
+	<test url="http://www.google.com.au/googleblogs" />
+	<test url="http://www.google.ca/grants" />
+	<test url="http://www.google.com/grants" />
+	<test url="http://www.google.com.au/grants" />
+	<test url="http://www.google.ca/green" />
+	<test url="http://www.google.com/green" />
+	<test url="http://www.google.com.au/green" />
+	<test url="http://www.google.ca/hangouts" />
+	<test url="http://www.google.com/hangouts" />
+	<test url="http://www.google.com.au/hangouts" />
+	<test url="http://www.google.ca/hostednews" />
+	<test url="http://www.google.com/hostednews" />
+	<test url="http://www.google.com.au/hostednews" />
+	<test url="http://www.google.ca/images" />
+	<test url="http://www.google.com/images" />
+	<test url="http://www.google.com.au/images" />
+	<test url="http://www.google.ca/intl" />
+	<test url="http://www.google.com/intl" />
+	<test url="http://www.google.com.au/intl" />
+	<test url="http://www.google.ca/js" />
+	<test url="http://www.google.com/js" />
+	<test url="http://www.google.com.au/js" />
+	<test url="http://www.google.ca/landing" />
+	<test url="http://www.google.com/landing" />
+	<test url="http://www.google.com.au/landing" />
+	<test url="http://www.google.ca/logos" />
+	<test url="http://www.google.com/logos" />
+	<test url="http://www.google.com.au/logos" />
+	<test url="http://www.google.ca/mapmaker" />
+	<test url="http://www.google.com/mapmaker" />
+	<test url="http://www.google.com.au/mapmaker" />
+	<test url="http://www.google.ca/mobile" />
+	<test url="http://www.google.com/mobile" />
+	<test url="http://www.google.com.au/mobile" />
+	<test url="http://www.google.ca/newproducts" />
+	<test url="http://www.google.com/newproducts" />
+	<test url="http://www.google.com.au/newproducts" />
+	<test url="http://www.google.ca/news" />
+	<test url="http://www.google.com/news" />
+	<test url="http://www.google.com.au/news" />
+	<test url="http://www.google.ca/nexus" />
+	<test url="http://www.google.com/nexus" />
+	<test url="http://www.google.com.au/nexus" />
+	<test url="http://www.google.ca/patents" />
+	<test url="http://www.google.com/patents" />
+	<test url="http://www.google.com.au/patents" />
+	<test url="http://www.google.ca/policies" />
+	<test url="http://www.google.com/policies" />
+	<test url="http://www.google.com.au/policies" />
+	<test url="http://www.google.ca/prdhp" />
+	<test url="http://www.google.com/prdhp" />
+	<test url="http://www.google.com.au/prdhp" />
+	<test url="http://www.google.ca/profiles" />
+	<test url="http://www.google.com/profiles" />
+	<test url="http://www.google.com.au/profiles" />
+	<test url="http://www.google.ca/products" />
+	<test url="http://www.google.com/products" />
+	<test url="http://www.google.com.au/products" />
+	<test url="http://www.google.ca/reader" />
+	<test url="http://www.google.com/reader" />
+	<test url="http://www.google.com.au/reader" />
+	<test url="http://www.google.ca/s2" />
+	<test url="http://www.google.com/s2" />
+	<test url="http://www.google.com.au/s2" />
+	<test url="http://www.google.ca/script" />
+	<test url="http://www.google.com/script" />
+	<test url="http://www.google.com.au/script" />
+	<test url="http://www.google.ca/settings" />
+	<test url="http://www.google.com/settings" />
+	<test url="http://www.google.com.au/settings" />
+	<test url="http://www.google.ca/shopping" />
+	<test url="http://www.google.com/shopping" />
+	<test url="http://www.google.com.au/shopping" />
+	<test url="http://www.google.ca/support" />
+	<test url="http://www.google.com/support" />
+	<test url="http://www.google.com.au/support" />
+	<test url="http://www.google.ca/tools" />
+	<test url="http://www.google.com/tools" />
+	<test url="http://www.google.com.au/tools" />
+	<test url="http://www.google.ca/transparencyreport" />
+	<test url="http://www.google.com/transparencyreport" />
+	<test url="http://www.google.com.au/transparencyreport" />
+	<test url="http://www.google.ca/trends" />
+	<test url="http://www.google.com/trends" />
+	<test url="http://www.google.com.au/trends" />
+	<test url="http://www.google.ca/urchin" />
+	<test url="http://www.google.com/urchin" />
+	<test url="http://www.google.com.au/urchin" />
+	<test url="http://www.google.ca/webmasters" />
+	<test url="http://www.google.com/webmasters" />
+	<test url="http://www.google.com.au/webmasters" />
+
+<!--	Paths that only exist/work on .com
+						-->
+<!-- covered in above rule
+	rule from="^http://(www\.)?google\.com/"
+		to="https://www.google.com/" /-->
+	<test url="http://google.com/" />
+	<test url="http://www.google.com/" />
+	<test url="http://www.google.com/+" />
+	<test url="http://www.google.com/appsstatus" />
+	<test url="http://www.google.com/buzz" />
+	<test url="http://www.google.com/chat" />
+	<test url="http://www.google.com/chromeos" />
+	<test url="http://www.google.com/extern_js" />
+	<test url="http://www.google.com/glass" />
+	<test url="http://www.google.com/googlebooks" />
+	<test url="http://www.google.com/ig" />
+	<test url="http://www.google.com/insights" />
+	<test url="http://www.google.com/moderator" />
+	<test url="http://www.google.com/phone" />
+	<test url="http://www.google.com/safebrowsing" />
+	<test url="http://www.google.com/videotargetting" />
+	<test url="http://www.google.com/webfonts" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index d284f30bd389..7c38b88afc75 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -26,16 +26,6 @@
 		- WebM_Project.org.xml
 		- With_Google.com.xml
 
-	Nonfunctional google.com paths:
-
-		- analytics	(redirects to http)
-		- imgres
-		- gadgets *
-		- u/		(404)
-
-	* Redirects to http
-
-
 	Problematic domains:
 
 		- www.goo.gl		(404; mismatched, CN: *.google.com)
@@ -85,7 +75,6 @@
 	<target host="*.ggpht.com" />
 	<target host="goo.gl" />
 	<target host="www.goo.gl" />
-	<target host="google.*" />
 	<target host="accounts.google.*" />
 	<target host="adwords.google.*" />
 	<target host="finance.google.*" />
@@ -101,9 +90,7 @@
 			<test url="http://news.google.com.au/newspapers" />
 	<target host="picasaweb.google.*" />
 	<target host="scholar.google.*" />
-	<target host="www.google.*" />
 	<target host="*.google.ca" />
-	<target host="google.co.*" />
 	<target host="accounts.google.co.*" />
 	<target host="adwords.google.co.*" />
 	<target host="finance.google.co.*" />
@@ -112,13 +99,10 @@
 	<target host="news.google.co.*" />
 	<target host="picasaweb.google.co.*" />
 	<target host="scholar.google.co.*" />
-	<target host="www.google.co.*" />
-	<target host="google.com" />
 	<target host="*.google.com" />
 		<exclusion pattern="^http://(www\.)?google\.com/analytics/*(?:/[^/]+)?(?:\?.*)?$" />
 		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
 		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
-	<target host="google.com.*" />
 	<target host="accounts.google.com.*" />
 	<target host="adwords.google.com.*" />
 	<target host="groups.google.com.*" />
@@ -126,7 +110,6 @@
 	<target host="news.google.com.*" />
 	<target host="picasaweb.google.com.*" />
 	<target host="scholar.google.com.*" />
-	<target host="www.google.com.*" />
 	<target host="googlecode.com" />
 	<target host="*.googlecode.com" />
 	<target host="googlesource.com" />
@@ -173,16 +156,6 @@
 		<test url="http://www.goo.gl/" />
 		<test url="http://goo.gl/" />
 
-	<!-- Google CSE -->
-	<rule from="^http://(?:www\.)?google\.(?:com?\.)?\w{2,3}/custom"
-		 to="https://www.google.com/cse" />
-		<test url="http://google.ca/custom" />
-		<test url="http://google.com/custom" />
-		<test url="http://google.com.au/custom" />
-		<test url="http://www.google.ca/custom" />
-		<test url="http://www.google.com/custom" />
-		<test url="http://www.google.com.au/custom" />
-
 	<!--	Subdomains that work on all in google.*
 							-->
 	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
@@ -246,250 +219,4 @@
 		<test url="http://foo.googlesource.com/" />
 		<test url="http://bar.googlesource.com/" />
 		<test url="http://www.googlesource.com/" />
-
-	<!-- Problems -->
-		<!--
-			https://www.google.com.au/tisp/	200 (OK)
-			https://www.google.com.au/tisp	404
-			https://www.google.com/tisp		404
-			http://www.google.com/tisp		301 (redirect)
-					-->
-		<rule from="^https?://(?:www\.)?google\.((?:com?\.)?\w{2,3})/tisp(?=$|\?)"
-			to="https://www.google.$1/tisp/" />
-			<test url="http://www.google.ca/tisp" />
-			<test url="http://www.google.com/tisp" />
-			<test url="http://www.google.com.au/tisp" />
-			<test url="https://www.google.ca/tisp" />
-			<test url="https://www.google.com/tisp" />
-			<test url="https://www.google.com.au/tisp" />
-			<test url="http://google.ca/tisp?" />
-			<test url="http://google.com/tisp?" />
-			<test url="http://google.com.au/tisp?" />
-
-
-		<!--	Paths that 404 on .ccltd, but work on .com:
-									-->
-		<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
-			 	to="https://www.google.com/" />
-			<test url="http://www.google.ca/calendar" />
-			<test url="http://www.google.com/calendar" />
-			<test url="http://www.google.com.au/calendar" />
-			<test url="http://www.google.ca/dictionary" />
-			<test url="http://www.google.com/dictionary" />
-			<test url="http://www.google.com.au/dictionary" />
-			<test url="http://www.google.ca/doubleclick" />
-			<test url="http://www.google.com/doubleclick" />
-			<test url="http://www.google.com.au/doubleclick" />
-			<test url="http://www.google.ca/foobar" />
-			<test url="http://www.google.com/foobar" />
-			<test url="http://www.google.com.au/foobar" />
-			<test url="http://www.google.ca/help" />
-			<test url="http://www.google.com/help" />
-			<test url="http://www.google.com.au/help" />
-			<test url="http://www.google.ca/ideas" />
-			<test url="http://www.google.com/ideas" />
-			<test url="http://www.google.com.au/ideas" />
-			<test url="http://www.google.ca/pacman" />
-			<test url="http://www.google.com/pacman" />
-			<test url="http://www.google.com.au/pacman" />
-			<test url="http://www.google.ca/partners" />
-			<test url="http://www.google.com/partners" />
-			<test url="http://www.google.com.au/partners" />
-			<test url="http://www.google.ca/postini" />
-			<test url="http://www.google.com/postini" />
-			<test url="http://www.google.com.au/postini" />
-			<test url="http://www.google.ca/powermeter" />
-			<test url="http://www.google.com/powermeter" />
-			<test url="http://www.google.com.au/powermeter" />
-			<test url="http://www.google.ca/url" />
-			<test url="http://www.google.com/url" />
-			<test url="http://www.google.com.au/url" />
-			<test url="http://www.google.ca/webdesigner" />
-			<test url="http://www.google.com/webdesigner" />
-			<test url="http://www.google.com.au/webdesigner" />
-
-	<!--	Paths that work on all in google.*
-	(Keep this the final rule in the set)
-							-->
-	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
-		 to="https://www.google.$1/" />
-		<test url="http://www.google.ca/accounts" />
-		<test url="http://www.google.com/accounts" />
-		<test url="http://www.google.com.au/accounts" />
-		<test url="http://www.google.ca/adplanner" />
-		<test url="http://www.google.com/adplanner" />
-		<test url="http://www.google.com.au/adplanner" />
-		<test url="http://www.google.ca/ads" />
-		<test url="http://www.google.com/ads" />
-		<test url="http://www.google.com.au/ads" />
-		<test url="http://www.google.ca/adsense" />
-		<test url="http://www.google.com/adsense" />
-		<test url="http://www.google.com.au/adsense" />
-		<test url="http://www.google.ca/adwords" />
-		<test url="http://www.google.com/adwords" />
-		<test url="http://www.google.com.au/adwords" />
-		<test url="http://www.google.ca/analytics" />
-		<test url="http://www.google.com/analytics" />
-		<test url="http://www.google.com.au/analytics" />
-		<test url="http://www.google.ca/bookmarks" />
-		<test url="http://www.google.com/bookmarks" />
-		<test url="http://www.google.com.au/bookmarks" />
-		<test url="http://www.google.ca/books" />
-		<test url="http://www.google.com/books" />
-		<test url="http://www.google.com.au/books" />
-		<test url="http://www.google.ca/chrome" />
-		<test url="http://www.google.com/chrome" />
-		<test url="http://www.google.com.au/chrome" />
-		<test url="http://www.google.ca/chromecast" />
-		<test url="http://www.google.com/chromecast" />
-		<test url="http://www.google.com.au/chromecast" />
-		<test url="http://www.google.ca/contacts" />
-		<test url="http://www.google.com/contacts" />
-		<test url="http://www.google.com.au/contacts" />
-		<test url="http://www.google.ca/coop" />
-		<test url="http://www.google.com/coop" />
-		<test url="http://www.google.com.au/coop" />
-		<test url="http://www.google.ca/cse" />
-		<test url="http://www.google.com/cse" />
-		<test url="http://www.google.com.au/cse" />
-		<test url="http://www.google.ca/css" />
-		<test url="http://www.google.com/css" />
-		<test url="http://www.google.com.au/css" />
-		<test url="http://www.google.ca/culturalinstitute" />
-		<test url="http://www.google.com/culturalinstitute" />
-		<test url="http://www.google.com.au/culturalinstitute" />
-		<test url="http://www.google.ca/doodles" />
-		<test url="http://www.google.com/doodles" />
-		<test url="http://www.google.com.au/doodles" />
-		<test url="http://www.google.ca/earth" />
-		<test url="http://www.google.com/earth" />
-		<test url="http://www.google.com.au/earth" />
-		<test url="http://www.google.ca/favicon.ico" />
-		<test url="http://www.google.com/favicon.ico" />
-		<test url="http://www.google.com.au/favicon.ico" />
-		<test url="http://www.google.ca/finance" />
-		<test url="http://www.google.com/finance" />
-		<test url="http://www.google.com.au/finance" />
-		<test url="http://www.google.ca/get" />
-		<test url="http://www.google.com/get" />
-		<test url="http://www.google.com.au/get" />
-		<test url="http://www.google.ca/goodtoknow" />
-		<test url="http://www.google.com/goodtoknow" />
-		<test url="http://www.google.com.au/goodtoknow" />
-		<test url="http://www.google.ca/googleblogs" />
-		<test url="http://www.google.com/googleblogs" />
-		<test url="http://www.google.com.au/googleblogs" />
-		<test url="http://www.google.ca/grants" />
-		<test url="http://www.google.com/grants" />
-		<test url="http://www.google.com.au/grants" />
-		<test url="http://www.google.ca/green" />
-		<test url="http://www.google.com/green" />
-		<test url="http://www.google.com.au/green" />
-		<test url="http://www.google.ca/hangouts" />
-		<test url="http://www.google.com/hangouts" />
-		<test url="http://www.google.com.au/hangouts" />
-		<test url="http://www.google.ca/hostednews" />
-		<test url="http://www.google.com/hostednews" />
-		<test url="http://www.google.com.au/hostednews" />
-		<test url="http://www.google.ca/images" />
-		<test url="http://www.google.com/images" />
-		<test url="http://www.google.com.au/images" />
-		<test url="http://www.google.ca/intl" />
-		<test url="http://www.google.com/intl" />
-		<test url="http://www.google.com.au/intl" />
-		<test url="http://www.google.ca/js" />
-		<test url="http://www.google.com/js" />
-		<test url="http://www.google.com.au/js" />
-		<test url="http://www.google.ca/landing" />
-		<test url="http://www.google.com/landing" />
-		<test url="http://www.google.com.au/landing" />
-		<test url="http://www.google.ca/logos" />
-		<test url="http://www.google.com/logos" />
-		<test url="http://www.google.com.au/logos" />
-		<test url="http://www.google.ca/mapmaker" />
-		<test url="http://www.google.com/mapmaker" />
-		<test url="http://www.google.com.au/mapmaker" />
-		<test url="http://www.google.ca/mobile" />
-		<test url="http://www.google.com/mobile" />
-		<test url="http://www.google.com.au/mobile" />
-		<test url="http://www.google.ca/newproducts" />
-		<test url="http://www.google.com/newproducts" />
-		<test url="http://www.google.com.au/newproducts" />
-		<test url="http://www.google.ca/news" />
-		<test url="http://www.google.com/news" />
-		<test url="http://www.google.com.au/news" />
-		<test url="http://www.google.ca/nexus" />
-		<test url="http://www.google.com/nexus" />
-		<test url="http://www.google.com.au/nexus" />
-		<test url="http://www.google.ca/patents" />
-		<test url="http://www.google.com/patents" />
-		<test url="http://www.google.com.au/patents" />
-		<test url="http://www.google.ca/policies" />
-		<test url="http://www.google.com/policies" />
-		<test url="http://www.google.com.au/policies" />
-		<test url="http://www.google.ca/prdhp" />
-		<test url="http://www.google.com/prdhp" />
-		<test url="http://www.google.com.au/prdhp" />
-		<test url="http://www.google.ca/profiles" />
-		<test url="http://www.google.com/profiles" />
-		<test url="http://www.google.com.au/profiles" />
-		<test url="http://www.google.ca/products" />
-		<test url="http://www.google.com/products" />
-		<test url="http://www.google.com.au/products" />
-		<test url="http://www.google.ca/reader" />
-		<test url="http://www.google.com/reader" />
-		<test url="http://www.google.com.au/reader" />
-		<test url="http://www.google.ca/s2" />
-		<test url="http://www.google.com/s2" />
-		<test url="http://www.google.com.au/s2" />
-		<test url="http://www.google.ca/script" />
-		<test url="http://www.google.com/script" />
-		<test url="http://www.google.com.au/script" />
-		<test url="http://www.google.ca/settings" />
-		<test url="http://www.google.com/settings" />
-		<test url="http://www.google.com.au/settings" />
-		<test url="http://www.google.ca/shopping" />
-		<test url="http://www.google.com/shopping" />
-		<test url="http://www.google.com.au/shopping" />
-		<test url="http://www.google.ca/support" />
-		<test url="http://www.google.com/support" />
-		<test url="http://www.google.com.au/support" />
-		<test url="http://www.google.ca/tools" />
-		<test url="http://www.google.com/tools" />
-		<test url="http://www.google.com.au/tools" />
-		<test url="http://www.google.ca/transparencyreport" />
-		<test url="http://www.google.com/transparencyreport" />
-		<test url="http://www.google.com.au/transparencyreport" />
-		<test url="http://www.google.ca/trends" />
-		<test url="http://www.google.com/trends" />
-		<test url="http://www.google.com.au/trends" />
-		<test url="http://www.google.ca/urchin" />
-		<test url="http://www.google.com/urchin" />
-		<test url="http://www.google.com.au/urchin" />
-		<test url="http://www.google.ca/webmasters" />
-		<test url="http://www.google.com/webmasters" />
-		<test url="http://www.google.com.au/webmasters" />
-
-	<!--	Paths that only exist/work on .com
-							-->
-	<!-- covered in above rule
-		rule from="^http://(www\.)?google\.com/"
-			to="https://www.google.com/" /-->
-		<test url="http://google.com/" />
-		<test url="http://www.google.com/" />
-		<test url="http://www.google.com/+" />
-		<test url="http://www.google.com/appsstatus" />
-		<test url="http://www.google.com/buzz" />
-		<test url="http://www.google.com/chat" />
-		<test url="http://www.google.com/chromeos" />
-		<test url="http://www.google.com/extern_js" />
-		<test url="http://www.google.com/glass" />
-		<test url="http://www.google.com/googlebooks" />
-		<test url="http://www.google.com/ig" />
-		<test url="http://www.google.com/insights" />
-		<test url="http://www.google.com/moderator" />
-		<test url="http://www.google.com/phone" />
-		<test url="http://www.google.com/safebrowsing" />
-		<test url="http://www.google.com/videotargetting" />
-		<test url="http://www.google.com/webfonts" />
 </ruleset>

From a133bc0f5f62c021468edc8a4d6c1171e0472969 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:25:14 +1100
Subject: [PATCH 36/77] [Google & Google Services] Simplified regex, moved
 exclusion into Google.xml added tests

---
 src/chrome/content/rules/Google.xml         | 3 +++
 src/chrome/content/rules/GoogleServices.xml | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index d49a2a0e6a3b..596cff0513a1 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -16,6 +16,9 @@
 <ruleset name="Google">
 	<target host="google.*" />
 	<target host="www.google.*" />
+	<exclusion pattern="^http://(www\.)?google\.com/analytics/?" />
+		<test url="http://www.google.com/analytics" />
+		<test url="http://google.com/analytics" />
 
 	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
 
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 7c38b88afc75..4f2c1dc9019d 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -100,9 +100,10 @@
 	<target host="picasaweb.google.co.*" />
 	<target host="scholar.google.co.*" />
 	<target host="*.google.com" />
-		<exclusion pattern="^http://(www\.)?google\.com/analytics/*(?:/[^/]+)?(?:\?.*)?$" />
 		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
+			<test url="" />
 		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
+			<test url="" />
 	<target host="accounts.google.com.*" />
 	<target host="adwords.google.com.*" />
 	<target host="groups.google.com.*" />

From 5df1d620e4e42e7ff63cf625bde32f6ffe6a96fa Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:32:01 +1100
Subject: [PATCH 37/77] [Google & Google Services] Fixed up and added more test
 urls

---
 src/chrome/content/rules/Google.xml         | 11 +++++------
 src/chrome/content/rules/GoogleServices.xml |  9 +++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 596cff0513a1..31e7a3da0d65 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -6,9 +6,8 @@
 
 	Nonfunctional google.com paths:
 
-		- analytics	(redirects to http)
-		- imgres
-		- gadgets *
+		- analytics	*
+		- imgres *
 		- u/		(404)
 
 	* Redirects to http
@@ -16,9 +15,9 @@
 <ruleset name="Google">
 	<target host="google.*" />
 	<target host="www.google.*" />
-	<exclusion pattern="^http://(www\.)?google\.com/analytics/?" />
-		<test url="http://www.google.com/analytics" />
-		<test url="http://google.com/analytics" />
+	<exclusion pattern="^http://(www\.)?google\.com/analytics/" />
+		<test url="http://www.google.com/analytics/" />
+		<test url="http://google.com/analytics/" />
 
 	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
 
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 4f2c1dc9019d..a421fdee6c4a 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -101,9 +101,14 @@
 	<target host="scholar.google.co.*" />
 	<target host="*.google.com" />
 		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
-			<test url="" />
+			<test url="http://cbks0.google.com/" />
+			<test url="http://cbks0.google.com/?" />
+			<test url="http://cbks0.google.com/?foo" />
 		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
-			<test url="" />
+			<test url="http://gg.google.com/" />
+			<test url="http://gg.google.com/foo" />
+			<test url="http://gg.google.com/foo?" />
+			<test url="http://gg.google.com/foo?bar" />
 	<target host="accounts.google.com.*" />
 	<target host="adwords.google.com.*" />
 	<target host="groups.google.com.*" />

From 1879438fcf2ea25c43e6d1879250e46194976c52 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:35:00 +1100
Subject: [PATCH 38/77] [Google] Little cosmetic fix

---
 src/chrome/content/rules/Google.xml | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 31e7a3da0d65..1452fbc53c46 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -50,8 +50,7 @@
 		<test url="http://www.google.ca/custom" />
 		<test url="http://www.google.com/custom" />
 		<test url="http://www.google.com.au/custom" />
-	<!--	Paths that 404 on .ccltd, but work on .com:
-								-->
+	<!--   Paths that 404 on .ccltd, but work on .com:   -->
 	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
 		 	to="https://www.google.com/" />
 		<test url="http://www.google.ca/calendar" />
@@ -91,9 +90,7 @@
 		<test url="http://www.google.com/webdesigner" />
 		<test url="http://www.google.com.au/webdesigner" />
 
-<!--	Paths that work on all in google.*
-(Keep this the final rule in the set)
-						-->
+<!--   Paths that work on all in google.*   -->
 <rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
 	 to="https://www.google.$1/" />
 	<test url="http://www.google.ca/accounts" />
@@ -253,11 +250,7 @@
 	<test url="http://www.google.com/webmasters" />
 	<test url="http://www.google.com.au/webmasters" />
 
-<!--	Paths that only exist/work on .com
-						-->
-<!-- covered in above rule
-	rule from="^http://(www\.)?google\.com/"
-		to="https://www.google.com/" /-->
+<!--   Paths that only exist/work on .com   -->
 	<test url="http://google.com/" />
 	<test url="http://www.google.com/" />
 	<test url="http://www.google.com/+" />

From 92294f27602ef2d0a823e31bd45b6c8f4edf5514 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:37:29 +1100
Subject: [PATCH 39/77] [Google Services] Added test urls for news.google.tld
 rule

---
 src/chrome/content/rules/GoogleServices.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index a421fdee6c4a..deade01d2560 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -199,6 +199,15 @@
 
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
+		<test url="http://news.google.ca/" />
+		<test url="http://news.google.ca/news" />
+		<test url="http://news.google.ca/newshp" />
+		<test url="http://news.google.com/" />
+		<test url="http://news.google.com/news" />
+		<test url="http://news.google.com/newshp" />
+		<test url="http://news.google.com.au/" />
+		<test url="http://news.google.com.au/news" />
+		<test url="http://news.google.com.au/newshp" />
 
 	<!-- subdomain to path redirects -->
 	<rule from="^http://(earth|trends)\.google\.com/"

From e0c9c8d6be746b006bc7c0ad807511fa9df473f4 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:45:20 +1100
Subject: [PATCH 40/77] [Google.com Subdomains] Remove redundant rule

---
 src/chrome/content/rules/Google.com_Subdomains.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 1eab530f19f5..fc7b28cf1f28 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -53,7 +53,10 @@
 <ruleset name="Google.com Subdomains">
 	<!--   Subdomains that only exist/work on .com   -->
 	<target host="admin.google.com" />
-	<target host="apis.google.com" />
+	<!--
+		apis.google.com
+		Covered in GoogleAPIs.xml
+	-->
 	<target host="appengine.google.com" />
 	<target host="calendar.google.com" />
 	<target host="cast.google.com" />

From 38113a29da5e3ba17bc4fe66ecc85ddbad198468 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Thu, 19 Feb 2015 16:58:20 +1100
Subject: [PATCH 41/77] Added exclusion for /imgres/

---
 src/chrome/content/rules/Google.xml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 1452fbc53c46..ca556c8b2a76 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -18,6 +18,9 @@
 	<exclusion pattern="^http://(www\.)?google\.com/analytics/" />
 		<test url="http://www.google.com/analytics/" />
 		<test url="http://google.com/analytics/" />
+	<exclusion pattern="^http://(www\.)?google\.com/imgres/" />
+		<test url="http://www.google.com/imgres/" />
+		<test url="http://google.com/imgres/" />
 
 	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
 

From f622c6d34065ba4db72d279252f3981f44c55ac8 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Fri, 20 Feb 2015 15:33:00 +1100
Subject: [PATCH 42/77] Split out rules further to have one file with simple
 rules and another with more complex ones.

---
 .../content/rules/Google.com_Subdomains.xml   | 69 +++++--------------
 .../rules/Google.com_Subdomains_Complex.xml   | 48 +++++++++++++
 src/chrome/content/rules/GoogleServices.xml   | 11 +--
 3 files changed, 68 insertions(+), 60 deletions(-)
 create mode 100644 src/chrome/content/rules/Google.com_Subdomains_Complex.xml

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index fc7b28cf1f28..415053da896c 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -1,6 +1,6 @@
 <!--
 	Other Google rulesets:
-
+		- See Google.com_Subdomains_Complex.html for rules that don't match the simple rule here
 		- See GoogleServices.xml for the list
 
 	Nonfunctional domains:
@@ -43,15 +43,8 @@
 			- gg		($ 404s)
 			- news		(→ www)
 			- scholar	(→ www)
-
-	Need covering:
-		- google.com subdomains:
-
-			- earth		(→ www)
-			- trends		(→ www)
 -->
 <ruleset name="Google.com Subdomains">
-	<!--   Subdomains that only exist/work on .com   -->
 	<target host="admin.google.com" />
 	<!--
 		apis.google.com
@@ -66,43 +59,20 @@
 	<target host="checkout.google.com" />
 	<target host="chrome.google.com" />
 	<target host="clients.google.com" />
-		<target host="clients*.google.com" />
-		<!-- See the complex rule section -->
-			<test url="http://clients1.google.com/" />
-			<test url="http://clients2.google.com/" />
-			<test url="http://clients3.google.com/" />
-			<!-- This is needed for OCSP responder to work.
-				If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
-			-->
-			<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
-				<test url="http://clients1.google.com/ocsp" />
-				<test url="http://clients2.google.com/ocsp" />
-				<test url="http://clients3.google.com/ocsp" />
+		<!-- See the complex ruleset for clients\d -->
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
 	<target host="corp.google.com" />
 		<target host="*.corp.google.com" />
-		<!-- See the complex rule section -->
-			<test url="http://login.corp.google.com/" />
-			<test url="http://ideas.corp.google.com/" />
-			<test url="http://discovery.corp.google.com/" />
+		<!-- See the wildcard section -->
 	<target host="developers.google.com" />
 	<target host="dl.google.com" />
 	<target host="docs.google.com" />
-	<!-- See the complex rule section -->
-		<target host="docs*.google.com" />
-			<test url="http://docs1.google.com/" />
-			<test url="http://docs2.google.com/" />
-			<test url="http://docs3.google.com/" />
-		<target host="*.docs.google.com" />
-			<test url="http://1.docs.google.com/" />
-			<test url="http://2.docs.google.com/" />
-			<test url="http://3.docs.google.com/" />
+		<!-- See the complex ruleset for docs\d -->
+		<!-- See the complex ruleset for \d\.docs -->
 	<target host="drive.google.com" />
 	<target host="encrypted.google.com" />
-		<target host="encrypted-tbn1.google.com" />
-		<target host="encrypted-tbn2.google.com" />
-		<target host="encrypted-tbn3.google.com" />
+		<!-- See the complex ruleset for encrypted-tbn\d -->
 	<target host="feedburner.google.com" />
 	<target host="feedproxy.google.com" />
 	<target host="fiber.google.com" />
@@ -138,25 +108,24 @@
 	<target host="sites.google.com" />
 	<target host="slides.google.com" />
 	<target host="spreadsheets.google.com" />
-		<target host="spreadsheets*.google.com" />
-		<!-- See the complex rule section -->
-			<test url="http://spreadsheets1.google.com/" />
-			<test url="http://spreadsheets2.google.com/" />
-			<test url="http://spreadsheets3.google.com/" />
 	<target host="support.google.com" />
 	<target host="talk.google.com" />
+	<!-- See the complex ruleset for tbn\d -->
 	<target host="tools.google.com" />
 	<target host="wallet.google.com" />
 
-	<!-- More Complex Rules -->
-	<rule from="^http://(clients\d|[\w-]+\.corp|docs\d|\d\.docs|spreadsheets\d)\.google\.com/"
-			to="https://$1.google.com/" />
-
-	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
-		to="https://encrypted-tbn$1.google.com/" />
-		<test url="http://tbn2.google.com/" />
-		<test url="http://encrypted-tbn2.google.com/" />
-		<test url="http://tbn1.google.com/" />
+	<!-- *.corp wildcard -->
+	<rule from="^http://([\w-]+)\.corp\.google\.com/"
+			to="https://$1.corp.google.com/" />
+		<test url="http://login.corp.google.com/" />
+		<test url="http://ideas.corp.google.com/" />
+		<test url="http://discovery.corp.google.com/" />
+
+	<!-- subdomain to path redirects -->
+	<rule from="^http://(earth|trends)\.google\.com/"
+		 to="https://www.google.com/$1" />
+		<test url="http://earth.google.com/" />
+		<test url="http://trends.google.com/" />
 
 	<rule from="^http:"
 			to="https:" />
diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
new file mode 100644
index 000000000000..fa78e5f4d0ae
--- /dev/null
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -0,0 +1,48 @@
+<!--
+	Other Google rulesets:
+		- See Google.com_Subdomains.html for rules that don't match the complex rule here
+		- See GoogleServices.xml for the list
+-->
+<ruleset name="Google.com Subdomains (Complex)">
+	<target host="*.google.com" />
+
+	<rule from="^http://(clients\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+		<test url="http://clients1.google.com/" />
+		<test url="http://clients2.google.com/" />
+		<test url="http://clients3.google.com/" />
+		<!-- This is needed for OCSP responder to work.
+			If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
+		-->
+		<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp"/>
+			<test url="http://clients1.google.com/ocsp" />
+			<test url="http://clients2.google.com/ocsp" />
+			<test url="http://clients3.google.com/ocsp" />
+
+	<rule from="^http://(docs\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+			<test url="http://docs1.google.com/" />
+			<test url="http://docs2.google.com/" />
+			<test url="http://docs3.google.com/" />
+
+	<rule from="^http://(\d\.docs)\.google\.com/"
+		 	to="https://$1.google.com/" />
+			<test url="http://1.docs.google.com/" />
+			<test url="http://2.docs.google.com/" />
+			<test url="http://3.docs.google.com/" />
+
+	<rule from="^http://(spreadsheets\d)\.google\.com/"
+		 	to="https://$1.google.com/" />
+		<test url="http://spreadsheets1.google.com/" />
+		<test url="http://spreadsheets2.google.com/" />
+		<test url="http://spreadsheets3.google.com/" />
+
+	<rule from="^http://(?:encrypted-)?tbn(\d)\.google\.com/"
+		to="https://encrypted-tbn$1.google.com/" />
+		<test url="http://encrypted-tbn1.google.com/" />
+		<test url="http://encrypted-tbn2.google.com/" />
+		<test url="http://encrypted-tbn3.google.com/" />
+		<test url="http://tbn1.google.com/" />
+		<test url="http://tbn2.google.com/" />
+		<test url="http://tbn3.google.com/" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index deade01d2560..5e15f79ee7f8 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -11,6 +11,7 @@
 		- FeedBurner.xml
 		- Go_Lang.org.xml
 		- Google.com_Subdomains.xml
+		- Google.com_Subdomains_Complex.html
 		- Google.org.xml
 		- GoogleAPIs.xml
 		- Google_App_Engine.xml
@@ -66,10 +67,6 @@
 		- tpc.googlesyndication.com
 		- mail-attachment.googleusercontent.com
 		- webcache.googleusercontent.com
-
-
-	XXX: Needs more testing
-
 -->
 <ruleset name="Google Services">
 	<target host="*.ggpht.com" />
@@ -209,12 +206,6 @@
 		<test url="http://news.google.com.au/news" />
 		<test url="http://news.google.com.au/newshp" />
 
-	<!-- subdomain to path redirects -->
-	<rule from="^http://(earth|trends)\.google\.com/"
-		 to="https://www.google.com/$1" />
-		<test url="http://earth.google.com/" />
-		<test url="http://trends.google.com/" />
-
 	<!-- wildcards -->
 
 	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"

From e9508aa53176243a4829052a333148f05b7ceb00 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Fri, 20 Feb 2015 22:31:27 +1100
Subject: [PATCH 43/77] [Google Search & Google.com Subdomains] ipv6. ->
 subdomains and remove redundant rule

---
 src/chrome/content/rules/Google.com_Subdomains.xml |  1 +
 src/chrome/content/rules/GoogleSearch.xml          | 12 ------------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 415053da896c..403587db2216 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -87,6 +87,7 @@
 	<target host="hostedtalkgadget.google.com" />
 	<target host="investor.google.com" />
 	<target host="ipv4.google.com" />
+	<target host="ipv6.google.com" />
 	<target host="knol.google.com" />
 	<target host="knoll.google.com" />
 	<target host="mail.google.com" />
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index d287108dac1c..dbf26f3980a8 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -32,13 +32,6 @@
 	<target host="clients6.google.*" />
 
 
-	<!--	Some Google pages can generate naive links back to the
-		unencrypted version of encrypted.google.com, which is
-		a 301 but theoretically vulnerable to SSL stripping.
-									-->
-	<rule from="^http://encrypted\.google\.com/"
-		to="https://encrypted.google.com/" />
-
 	<!--	The most basic case.
 					-->
 	<rule from="^http://(?:www\.)?google\.com/search"
@@ -88,11 +81,6 @@
 	<rule from="^http://(?:www\.)?google\.com/$"
 		to="https://www.google.com/" />
 
-	<!--	Google supports IPv6 search, including
-		HTTPS with a valid certificate!	-->
-	<rule from="^http://ipv6\.google\.com/"
-		to="https://ipv6.google.com/" />
-
 	<!--	most google international sites look like
 		"google.fr", some look like "google.co.jp",
 		and some crazy ones like "google.com.au"	-->

From 5fff06fc8c72fad75ab8fa79eea23fbbeb9c58f9 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Fri, 20 Feb 2015 22:52:15 +1100
Subject: [PATCH 44/77] clients\d -> clients1 as only clients1 supports https

---
 .../content/rules/Google.com_Subdomains.xml   |  2 ++
 .../rules/Google.com_Subdomains_Complex.xml   | 14 +++++++++++-
 src/chrome/content/rules/GoogleSearch.xml     | 22 -------------------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 403587db2216..7af8da1f0832 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -109,6 +109,8 @@
 	<target host="sites.google.com" />
 	<target host="slides.google.com" />
 	<target host="spreadsheets.google.com" />
+	<target host="suggestqueries.google.com" />
+		<exclusion pattern="^http://suggestqueries\.google\.com/.*client=.*" /> <!-- need to test if this exclusion is still needed -->
 	<target host="support.google.com" />
 	<target host="talk.google.com" />
 	<!-- See the complex ruleset for tbn\d -->
diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
index fa78e5f4d0ae..b14019ccf3a1 100644
--- a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -7,10 +7,20 @@
 	<target host="*.google.com" />
 
 	<rule from="^http://(clients\d)\.google\.com/"
-		 	to="https://$1.google.com/" />
+		 	to="https://clients1.google.com/" />
 		<test url="http://clients1.google.com/" />
 		<test url="http://clients2.google.com/" />
 		<test url="http://clients3.google.com/" />
+		<!--
+			The need for clients\d -> clients1
+
+			"http://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
+			HTTP/1.1 200 OK
+			"https://clients2.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"
+			HTTP/1.1 404 Not Found
+			"https://clients1.google.com/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1"s
+			HTTP/1.1 200 OK
+		-->
 		<!-- This is needed for OCSP responder to work.
 			If OCSP checking is set to hard-fail the user-agent might have troubles accessing some HTTPS sites
 		-->
@@ -19,6 +29,8 @@
 			<test url="http://clients2.google.com/ocsp" />
 			<test url="http://clients3.google.com/ocsp" />
 
+		<exclusion pattern="^http://clients\d\.google\.com/.*client=products.*" /> <!-- need to test if this exclusion is still needed -->
+
 	<rule from="^http://(docs\d)\.google\.com/"
 		 	to="https://$1.google.com/" />
 			<test url="http://docs1.google.com/" />
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index dbf26f3980a8..862b2393be7b 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -41,14 +41,6 @@
 		seem to need for the basic case
 						-->
 	<exclusion pattern="^http://(?:www\.)?google\.com/search.*tbs=shop" />
-	<exclusion pattern="^http://clients\d\.google\.com/.*client=products.*" />
-	<exclusion pattern="^http://suggestqueries\.google\.com/.*client=.*" />
-
-	<!-- https://trac.torproject.org/projects/tor/ticket/9713 
-				 -->
-
-	<exclusion pattern="^http://clients[0-9]\.google\.com/ocsp" />
-
 
 	<!--	This is necessary for image results
 		links from web search results
@@ -92,20 +84,6 @@
 	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/setprefs"
 	to="https://$1google$2.$3/setprefs" />
 
-	<!--	Completion urls look like this:
-
-http://clients2.google.co.jp/complete/search?hl=ja&client=hp&expIds=17259,24660,24729,24745&q=m&cp=1 HTTP/1.1\r\n
-
-		-->
-	<rule from="^http://clients\d\.google\.com/complete/search"
-		to="https://clients1.google.com/complete/search" />
-
-	<rule from="^http://clients\d\.google(\.com?\.[a-z]{2})/complete/search"
-		to="https://clients1.google.$1/complete/search" />
-
-	<rule from="^http://clients\d\.google\.([a-z]{2})/complete/search"
-		to="https://clients1.google.$1/complete/search" />
-
 	<rule from="^http://suggestqueries\.google\.com/complete/search"
 		to="https://clients1.google.com/complete/search" />
 

From fc2f16fd5e642c5b1ec7f6d891c796b190cb739d Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Fri, 20 Feb 2015 22:54:35 +1100
Subject: [PATCH 45/77] Removed unneeded exclusions and unused targets

---
 .../content/rules/Google.com_Subdomains.xml   |  1 -
 .../rules/Google.com_Subdomains_Complex.xml   |  2 --
 src/chrome/content/rules/GoogleSearch.xml     | 25 -------------------
 3 files changed, 28 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 7af8da1f0832..341f0f1c2539 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -110,7 +110,6 @@
 	<target host="slides.google.com" />
 	<target host="spreadsheets.google.com" />
 	<target host="suggestqueries.google.com" />
-		<exclusion pattern="^http://suggestqueries\.google\.com/.*client=.*" /> <!-- need to test if this exclusion is still needed -->
 	<target host="support.google.com" />
 	<target host="talk.google.com" />
 	<!-- See the complex ruleset for tbn\d -->
diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
index b14019ccf3a1..af96b239220c 100644
--- a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -29,8 +29,6 @@
 			<test url="http://clients2.google.com/ocsp" />
 			<test url="http://clients3.google.com/ocsp" />
 
-		<exclusion pattern="^http://clients\d\.google\.com/.*client=products.*" /> <!-- need to test if this exclusion is still needed -->
-
 	<rule from="^http://(docs\d)\.google\.com/"
 		 	to="https://$1.google.com/" />
 			<test url="http://docs1.google.com/" />
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index 862b2393be7b..20141f0f8af7 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -8,28 +8,6 @@
 	<target host="www.google.co.*" />
 	<target host="google.*" />
 	<target host="www.google.*" />
-	<!--
-		Beyond clients1 these do not currently
-		exist in the ccTLDs, but just in case...
-							-->
-	<target host="clients1.google.com.*" />
-	<target host="clients2.google.com.*" />
-	<target host="clients3.google.com.*" />
-	<target host="clients4.google.com.*" />
-	<target host="clients5.google.com.*" />
-	<target host="clients6.google.com.*" />
-	<target host="clients1.google.co.*" />
-	<target host="clients2.google.co.*" />
-	<target host="clients3.google.co.*" />
-	<target host="clients4.google.co.*" />
-	<target host="clients5.google.co.*" />
-	<target host="clients6.google.co.*" />
-	<target host="clients1.google.*" />
-	<target host="clients2.google.*" />
-	<target host="clients3.google.*" />
-	<target host="clients4.google.*" />
-	<target host="clients5.google.*" />
-	<target host="clients6.google.*" />
 
 
 	<!--	The most basic case.
@@ -84,9 +62,6 @@
 	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/setprefs"
 	to="https://$1google$2.$3/setprefs" />
 
-	<rule from="^http://suggestqueries\.google\.com/complete/search"
-		to="https://clients1.google.com/complete/search" />
-
 	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?$"
 		to="https://$1google.$2$3/" />
 

From 3090416cdeeda464d9cd65db81fa0cfcc808fe0b Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 21 Feb 2015 14:14:54 +1100
Subject: [PATCH 46/77] Cleaning up GoogleSearch.xml

---
 .../content/rules/Google.com_Subdomains.xml   |  1 +
 src/chrome/content/rules/GoogleSearch.xml     | 39 ++++++++-----------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 341f0f1c2539..0b9578d3fb20 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -62,6 +62,7 @@
 		<!-- See the complex ruleset for clients\d -->
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
+		<!-- See GoogleSearch.xml for codesearch -->
 	<target host="corp.google.com" />
 		<target host="*.corp.google.com" />
 		<!-- See the wildcard section -->
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index 20141f0f8af7..74038b67f7c4 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -1,3 +1,7 @@
+<!--
+	Other Google rulesets:
+		- See GoogleServices.xml for the list
+-->
 <ruleset name="Google Search">
 
 	<target host="google.com" />
@@ -9,11 +13,8 @@
 	<target host="google.*" />
 	<target host="www.google.*" />
 
-
-	<!--	The most basic case.
-					-->
-	<rule from="^http://(?:www\.)?google\.com/search"
-		to="https://www.google.com/search" />
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(?=#|\?|$)"
+		to="https://www.google.$2/" />
 
 	<!--	A very annoying exception that we
 		seem to need for the basic case
@@ -25,9 +26,6 @@
 						-->
 	<exclusion pattern="^http://(?:www\.)?google\.com/search.*tbm=isch.*" />
 
-	<rule from="^http://(?:www\.)?google\.com/about"
-		to="https://www.google.com/about" />
-
 	<!--	There are two distinct cases for these firefox searches	-->
 
 	<rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z]{2}/firefox/?$"
@@ -40,17 +38,12 @@
 		to="https://www.google.com/webhp" />
 
 	<rule from="^http://codesearch\.google\.com/"
-		to="https://codesearch.google.com/" />
+		to="https://www.google.com/codesearch/" />
+		<test url="http://codesearch.google.com/" />
 
 	<rule from="^http://(?:www\.)?google\.com/codesearch"
 		to="https://www.google.com/codesearch" />
 
-	<rule from="^http://(?:www\.)?google\.com/#"
-		to="https://www.google.com/#" />
-
-	<rule from="^http://(?:www\.)?google\.com/$"
-		to="https://www.google.com/" />
-
 	<!--	most google international sites look like
 		"google.fr", some look like "google.co.jp",
 		and some crazy ones like "google.com.au"	-->
@@ -58,10 +51,6 @@
 	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/(search\?|#)"
 		to="https://$1google$2.$3/$4" />
 
-	<!--	Language preference setting	-->
-	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/setprefs"
-	to="https://$1google$2.$3/setprefs" />
-
 	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?$"
 		to="https://$1google.$2$3/" />
 
@@ -69,8 +58,14 @@
 	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?\?"
 		to="https://$1google.$2$3/webhp?" />
 
-	<!-- teapot -->
-	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/teapot"
-		to="https://$1google$2.$3/teapot" />
+	<!-- Paths -->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(about|search|setprefs|teapot)"
+		to="https://www.google.$2/$3" />
+		<test url="http://google.ca/teapot" />
+		<test url="http://google.com/teapot" />
+		<test url="http://google.com.au/teapot" />
+		<test url="http://www.google.ca/teapot" />
+		<test url="http://www.google.com/teapot" />
+		<test url="http://www.google.com.au/teapot" />
 
 </ruleset>

From b891e4c9a54cbfc379843afefb691c7fac652053 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 21 Feb 2015 15:25:19 +1100
Subject: [PATCH 47/77] Further cleanup of GoogleSearch.xml

---
 src/chrome/content/rules/GoogleSearch.xml | 58 ++++++++++++-----------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index 74038b67f7c4..28e16173c7f6 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -15,6 +15,15 @@
 
 	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(?=#|\?|$)"
 		to="https://www.google.$2/" />
+		<test url="http://google.ca/" />
+		<test url="http://google.com/" />
+		<test url="http://google.com.au/" />
+		<test url="http://www.google.ca/#" />
+		<test url="http://www.google.com/#" />
+		<test url="http://www.google.com.au/#" />
+		<test url="http://www.google.ca/?" />
+		<test url="http://www.google.com/?" />
+		<test url="http://www.google.com.au/?" />
 
 	<!--	A very annoying exception that we
 		seem to need for the basic case
@@ -34,38 +43,33 @@
 	<rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z]{2}/firefox"
 		to="https://www.google.com/webhp" />
 
-	<rule from="^http://(?:www\.)?google\.com/webhp"
-		to="https://www.google.com/webhp" />
+	<!-- Paths -->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(about|search|setprefs|teapot|webhp)"
+		to="https://www.google.$2/$3" />
+		<test url="http://google.ca/about" />
+		<test url="http://google.com/about" />
+		<test url="http://google.com.au/about" />
+		<test url="http://www.google.ca/search" />
+		<test url="http://www.google.com/search" />
+		<test url="http://www.google.com.au/search" />
+		<test url="http://google.ca/setprefs" />
+		<test url="http://google.com/setprefs" />
+		<test url="http://google.com.au/setprefs" />
+		<test url="http://www.google.ca/teapot" />
+		<test url="http://www.google.com/teapot" />
+		<test url="http://www.google.com.au/teapot" />
+		<test url="http://www.google.ca/webhp" />
+		<test url="http://www.google.com/webhp" />
+		<test url="http://www.google.com.au/webhp" />
 
+	<!-- This doesn't exist anymore, but still rewriting to prevent old queries from being leaked -->
 	<rule from="^http://codesearch\.google\.com/"
 		to="https://www.google.com/codesearch/" />
 		<test url="http://codesearch.google.com/" />
 
-	<rule from="^http://(?:www\.)?google\.com/codesearch"
+	<rule from="^http://(www\.)?google\.com/codesearch"
 		to="https://www.google.com/codesearch" />
-
-	<!--	most google international sites look like
-		"google.fr", some look like "google.co.jp",
-		and some crazy ones like "google.com.au"	-->
-
-	<rule from="^http://(www\.)?google(\.com?)?\.([a-z]{2})/(search\?|#)"
-		to="https://$1google$2.$3/$4" />
-
-	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?$"
-		to="https://$1google.$2$3/" />
-
-	<!--	If there are URL parameters, keep them.	-->
-	<rule from="^http://(www\.)?google\.(com?\.)?([a-z]{2})/(?:webhp)?\?"
-		to="https://$1google.$2$3/webhp?" />
-
-	<!-- Paths -->
-	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(about|search|setprefs|teapot)"
-		to="https://www.google.$2/$3" />
-		<test url="http://google.ca/teapot" />
-		<test url="http://google.com/teapot" />
-		<test url="http://google.com.au/teapot" />
-		<test url="http://www.google.ca/teapot" />
-		<test url="http://www.google.com/teapot" />
-		<test url="http://www.google.com.au/teapot" />
+		<test url="http://google.com/codesearch" />
+		<test url="http://www.google.com/codesearch" />
 
 </ruleset>

From 3239df51bab979c78c1584537a520c622217ad46 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 21 Feb 2015 15:37:50 +1100
Subject: [PATCH 48/77] [Google Search] Added test urls, cleaned up /firefox/

---
 src/chrome/content/rules/GoogleSearch.xml | 51 ++++++++++++++++++-----
 1 file changed, 41 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index 28e16173c7f6..28866cb5ea30 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -28,36 +28,67 @@
 	<!--	A very annoying exception that we
 		seem to need for the basic case
 						-->
-	<exclusion pattern="^http://(?:www\.)?google\.com/search.*tbs=shop" />
+	<exclusion pattern="^http://(www\.)?google\.com/search.*tbs=shop" />
+		<test url="http://google.com/search?q=test&amp;tbs=shop" />
+		<test url="http://www.google.com/search?q=test&amp;tbs=shop" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbs=shop" />
 
 	<!--	This is necessary for image results
 		links from web search results
 						-->
-	<exclusion pattern="^http://(?:www\.)?google\.com/search.*tbm=isch.*" />
-
-	<!--	There are two distinct cases for these firefox searches	-->
-
-	<rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z]{2}/firefox/?$"
-		to="https://www.google.com/" />
-
-	<rule from="^http://(?:www\.)?google(?:\.com?)?\.[a-z]{2}/firefox"
-		to="https://www.google.com/webhp" />
+	<exclusion pattern="^http://(www\.)?google\.com/search.*tbm=isch.*" />
+		<test url="http://google.com/search?q=test&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=test&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch&amp;something=baz" />
 
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/firefox/?"
+		to="https://www.google.$2/" />
+		<test url="http://google.ca/firefox" />
+		<test url="http://google.com/firefox" />
+		<test url="http://google.com.au/firefox" />
+		<test url="http://www.google.ca/firefox" />
+		<test url="http://www.google.com/firefox" />
+		<test url="http://www.google.com.au/firefox" />
+		<test url="http://google.ca/firefox/" />
+		<test url="http://google.com/firefox/" />
+		<test url="http://google.com.au/firefox/" />
+		<test url="http://www.google.ca/firefox/" />
+		<test url="http://www.google.com/firefox/" />
+		<test url="http://www.google.com.au/firefox/" />
 	<!-- Paths -->
 	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(about|search|setprefs|teapot|webhp)"
 		to="https://www.google.$2/$3" />
 		<test url="http://google.ca/about" />
 		<test url="http://google.com/about" />
 		<test url="http://google.com.au/about" />
+		<test url="http://www.google.ca/about" />
+		<test url="http://www.google.com/about" />
+		<test url="http://www.google.com.au/about" />
+		<test url="http://google.ca/search" />
+		<test url="http://google.com/search" />
+		<test url="http://google.com.au/search" />
 		<test url="http://www.google.ca/search" />
 		<test url="http://www.google.com/search" />
 		<test url="http://www.google.com.au/search" />
 		<test url="http://google.ca/setprefs" />
 		<test url="http://google.com/setprefs" />
 		<test url="http://google.com.au/setprefs" />
+		<test url="http://www.google.ca/setprefs" />
+		<test url="http://www.google.com/setprefs" />
+		<test url="http://www.google.com.au/setprefs" />
+		<test url="http://www.google.ca/setprefs" />
+		<test url="http://www.google.com/setprefs" />
+		<test url="http://www.google.com.au/setprefs" />
+		<test url="http://google.ca/teapot" />
+		<test url="http://google.com/teapot" />
+		<test url="http://google.com.au/teapot" />
 		<test url="http://www.google.ca/teapot" />
 		<test url="http://www.google.com/teapot" />
 		<test url="http://www.google.com.au/teapot" />
+		<test url="http://google.ca/webhp" />
+		<test url="http://google.com/webhp" />
+		<test url="http://google.com.au/webhp" />
 		<test url="http://www.google.ca/webhp" />
 		<test url="http://www.google.com/webhp" />
 		<test url="http://www.google.com.au/webhp" />

From 90962406dbcc25de23c13c7a00241a35d969eda0 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 21 Feb 2015 15:46:03 +1100
Subject: [PATCH 49/77] [Google Search] Removed redundant targets

---
 src/chrome/content/rules/GoogleSearch.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index 28866cb5ea30..b951a5d53d2f 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -3,13 +3,6 @@
 		- See GoogleServices.xml for the list
 -->
 <ruleset name="Google Search">
-
-	<target host="google.com" />
-	<target host="*.google.com" />
-	<target host="google.com.*" />
-	<target host="www.google.com.*" />
-	<target host="google.co.*" />
-	<target host="www.google.co.*" />
 	<target host="google.*" />
 	<target host="www.google.*" />
 

From 89c8851987159039897212c3111197d1e15b816f Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 16:34:09 +1100
Subject: [PATCH 50/77] Removed GoogleCanada.xml as Google.xml covers it

---
 src/chrome/content/rules/GoogleCanada.xml | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 src/chrome/content/rules/GoogleCanada.xml

diff --git a/src/chrome/content/rules/GoogleCanada.xml b/src/chrome/content/rules/GoogleCanada.xml
deleted file mode 100644
index d5eefe816210..000000000000
--- a/src/chrome/content/rules/GoogleCanada.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<ruleset name="GoogleCanada">
-	<target host="google.ca" />
-	<target host="*.google.ca" />
-	<rule from="^http://([^/:@\.]+)\.google\.ca/finance" to="https://$1.google.ca/finance"/>
-</ruleset>
-

From 8f83057f260eb414efebe2866205712d8f8efe16 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 16:36:02 +1100
Subject: [PATCH 51/77] Renamed GoogleServices (simple&complex) in line with
 the naming of Google.com_Subdomains

---
 src/chrome/content/rules/GoogleServices.xml   | 252 ++----------------
 .../content/rules/GoogleServices_Complex.xml  | 228 ++++++++++++++++
 .../content/rules/GoogleServices_Simple.xml   |  32 ---
 3 files changed, 256 insertions(+), 256 deletions(-)
 create mode 100644 src/chrome/content/rules/GoogleServices_Complex.xml
 delete mode 100644 src/chrome/content/rules/GoogleServices_Simple.xml

diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 5e15f79ee7f8..ed14063cb473 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -1,228 +1,32 @@
 <!--
-	Other Google rulesets:
-
-		- 2mdn.net.xml
-		- Admeld.xml
-		- Android.xml
-		- ChannelIntelligence.com.xml
-		- Chrome_Status.com.xml
-		- Chromium.org.xml
-		- Doubleclick.net.xml
-		- FeedBurner.xml
-		- Go_Lang.org.xml
-		- Google.com_Subdomains.xml
-		- Google.com_Subdomains_Complex.html
-		- Google.org.xml
-		- GoogleAPIs.xml
-		- Google_App_Engine.xml
-		- GoogleImages.xml
-		- GoogleServices_Simple.xml (Simple rules that normally would reside here are in this ruleset)
-		- GoogleShopping.xml
-		- Ingress.xml
-		- Made_with_Code.com.xml
-		- Meebo.xml
-		- Orkut.xml
-		- Polymer-Project.org.xml
-		- Postini.xml
-		- WebM_Project.org.xml
-		- With_Google.com.xml
-
-	Problematic domains:
-
-		- www.goo.gl		(404; mismatched, CN: *.google.com)
-
-		- www.news.google.ca ²
-
-		- news.google.cctld **
-		- scholar.google.cctld **
-		- *-opensocial.googleusercontent.com ***
-
-	² Mismatched, CN: google.com
-	**** $ 404s
-	* 404, valid cert
-	** Redirects to http, valid cert
-	*** Breaks followers widget - https://trac.torproject.org/projects/tor/ticket/7294
-
-
-	Partially covered domains:
-
-		- google.cctld subdomains:
-
-			- scholar	(→ www)
-
-		- *.googleusercontent.com	(*-opensocial excluded)
-
-
-	Fully covered domains:
+	Rules that are simple to write go in here, for everything else
+	See GoogleServices.xml
 
-		- lh[3-6].ggpht.com
-		- (www.)goo.gl		(www → ^)
+	Other Google rulesets:
 
-		- partner.googleadservices.com
-		- (www.)googlecode.com
-		- *.googlecode.com	(per-project subdomains)
-		- googlesource.com
-		- *.googlesource.com
-		- pagead2.googlesyndication.com
-		- tpc.googlesyndication.com
-		- mail-attachment.googleusercontent.com
-		- webcache.googleusercontent.com
+		- See GoogleServices.xml for the list
 -->
-<ruleset name="Google Services">
-	<target host="*.ggpht.com" />
-	<target host="goo.gl" />
-	<target host="www.goo.gl" />
-	<target host="accounts.google.*" />
-	<target host="adwords.google.*" />
-	<target host="finance.google.*" />
-	<target host="groups.google.*" />
-	<target host="it.google.*" />
-	<target host="news.google.*" />
-		<exclusion pattern="^http://(news\.)?google\.((?:com?\.)?\w{2,3})/(archivesearch|newspapers)" />
-			<test url="http://news.google.ca/archivesearch" />
-			<test url="http://news.google.com/archivesearch" />
-			<test url="http://news.google.com.au/archivesearch" />
-			<test url="http://news.google.ca/newspapers" />
-			<test url="http://news.google.com/newspapers" />
-			<test url="http://news.google.com.au/newspapers" />
-	<target host="picasaweb.google.*" />
-	<target host="scholar.google.*" />
-	<target host="*.google.ca" />
-	<target host="accounts.google.co.*" />
-	<target host="adwords.google.co.*" />
-	<target host="finance.google.co.*" />
-	<target host="groups.google.co.*" />
-	<target host="id.google.co.*" />
-	<target host="news.google.co.*" />
-	<target host="picasaweb.google.co.*" />
-	<target host="scholar.google.co.*" />
-	<target host="*.google.com" />
-		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
-			<test url="http://cbks0.google.com/" />
-			<test url="http://cbks0.google.com/?" />
-			<test url="http://cbks0.google.com/?foo" />
-		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
-			<test url="http://gg.google.com/" />
-			<test url="http://gg.google.com/foo" />
-			<test url="http://gg.google.com/foo?" />
-			<test url="http://gg.google.com/foo?bar" />
-	<target host="accounts.google.com.*" />
-	<target host="adwords.google.com.*" />
-	<target host="groups.google.com.*" />
-	<target host="id.google.com.*" />
-	<target host="news.google.com.*" />
-	<target host="picasaweb.google.com.*" />
-	<target host="scholar.google.com.*" />
-	<target host="googlecode.com" />
-	<target host="*.googlecode.com" />
-	<target host="googlesource.com" />
-	<target host="*.googlesource.com" />
-	<target host="*.googlesyndication.com" />
-	<target host="*.googleusercontent.com" />
-	<target host="*.corp.googleusercontent.com" />
-		<!--
-			Necessary for the Followers widget:
-
-				 https://trac.torproject.org/projects/tor/ticket/7294
-											-->
-		<exclusion pattern="http://[^@:\./]+-opensocial\.googleusercontent\.com" />
-			<test url="http://foo-opensocial.googleusercontent.com" />
-			<test url="http://bar-opensocial.googleusercontent.com" />
-			<test url="http://foobar-opensocial.googleusercontent.com" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
-	<!--
-		Can we secure any of these wildcard cookies safely?
-									-->
-	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
-	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
-	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
-	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
-	<securecookie host="^mail-attachment\.googleusercontent\.com$" name=".+" />
-
-	<!--    - lh 3-6 exist
-		- All appear identical
-		- Identical to lh\d.googleusercontent.com
-					-->
-	<rule from="^http://lh(\d)\.ggpht\.com/"
-		to="https://lh$1.ggpht.com/" />
-		<test url="http://lh3.ggpht.com/" />
-		<test url="http://lh4.ggpht.com/" />
-		<test url="http://lh5.ggpht.com/" />
-		<test url="http://lh6.ggpht.com/" />
-
-	<rule from="^http://(www\.)?goo\.gl/"
-		to="https://goo.gl/" />
-		<test url="http://www.goo.gl/" />
-		<test url="http://goo.gl/" />
-
-	<!--	Subdomains that work on all in google.*
-							-->
-	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
-		to="https://$1.google.$2/" />
-		<test url="http://accounts.google.ca/" />
-		<test url="http://accounts.google.com/" />
-		<test url="http://accounts.google.com.au/" />
-		<test url="http://adwords.google.ca/" />
-		<test url="http://adwords.google.com/" />
-		<test url="http://adwords.google.com.au/" />
-		<test url="http://finance.google.ca/" />
-		<test url="http://finance.google.com/" />
-		<test url="http://finance.google.com.au/" />
-		<test url="http://groups.google.ca/" />
-		<test url="http://groups.google.com/" />
-		<test url="http://groups.google.com.au/" />
-		<test url="http://id.google.ca/" />
-		<test url="http://id.google.com/" />
-		<test url="http://id.google.com.au/" />
-		<test url="http://lh3.google.ca/" />
-		<test url="http://lh4.google.com/" />
-		<test url="http://lh5.google.com.au/" />
-		<test url="http://m.google.ca/" />
-		<test url="http://m.google.com/" />
-		<test url="http://m.google.com.au/" />
-		<test url="http://picasaweb.google.ca/" />
-		<test url="http://picasaweb.google.com/" />
-		<test url="http://picasaweb.google.com.au/" />
-
-	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
-		to="https://www.google.$1/intl/" />
-		<test url="http://scholar.google.ca/intl/" />
-		<test url="http://scholar.google.com/intl/" />
-		<test url="http://scholar.google.com.au/intl/" />
-
-	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
-		to="https://www.google.com/news" />
-		<test url="http://news.google.ca/" />
-		<test url="http://news.google.ca/news" />
-		<test url="http://news.google.ca/newshp" />
-		<test url="http://news.google.com/" />
-		<test url="http://news.google.com/news" />
-		<test url="http://news.google.com/newshp" />
-		<test url="http://news.google.com.au/" />
-		<test url="http://news.google.com.au/news" />
-		<test url="http://news.google.com.au/newshp" />
-
-	<!-- wildcards -->
-
-	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
-		to="https://$1.googleusercontent.com/" />
-		<test url="http://webcache.googleusercontent.com/" />
-		<test url="http://foo.googleusercontent.com/" />
-		<test url="http://bar.googleusercontent.com/" />
-
-	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
-		 to="https://$1googlecode.com/" />
-		<test url="http://foo.googlecode.com/" />
-		<test url="http://bar.googlecode.com/" />
-		<test url="http://www.googlecode.com/" />
-
-	<rule from="^http://([^@:\./]+\.)?googlesource\.com/"
-		to="https://$1googlesource.com/" />
-		<test url="http://foo.googlesource.com/" />
-		<test url="http://bar.googlesource.com/" />
-		<test url="http://www.googlesource.com/" />
-</ruleset>
+<ruleset name="Google Services Simple">
+	<target host="partner.googleadservices.com" />
+	<target host="pagead2.googlesyndication.com" />
+	<target host="tpc.googlesyndication.com" />
+
+	<target host="googletagmanager.com" />
+	<target host="www.googletagmanager.com" />
+
+	<!-- Gmail -->
+	<target host="gmail.com" />
+		<target host="www.gmail.com" />
+	<target host="googlemail.com" />
+		<target host="www.googlemail.com" />
+	<securecookie host="^gmail\.com$" name=".+" />
+	<securecookie host="^www\.gmail\.com$" name=".+" />
+	<securecookie host="^googlemail\.com$" name=".+" />
+	<securecookie host="^www\.googlemail\.com$" name=".+" />
+
+	<!-- !www doesn't exist -->
+	<target host="www.googletagservices.com" />
+
+	<rule from="^http:"
+			to="https:" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
new file mode 100644
index 000000000000..5e15f79ee7f8
--- /dev/null
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -0,0 +1,228 @@
+<!--
+	Other Google rulesets:
+
+		- 2mdn.net.xml
+		- Admeld.xml
+		- Android.xml
+		- ChannelIntelligence.com.xml
+		- Chrome_Status.com.xml
+		- Chromium.org.xml
+		- Doubleclick.net.xml
+		- FeedBurner.xml
+		- Go_Lang.org.xml
+		- Google.com_Subdomains.xml
+		- Google.com_Subdomains_Complex.html
+		- Google.org.xml
+		- GoogleAPIs.xml
+		- Google_App_Engine.xml
+		- GoogleImages.xml
+		- GoogleServices_Simple.xml (Simple rules that normally would reside here are in this ruleset)
+		- GoogleShopping.xml
+		- Ingress.xml
+		- Made_with_Code.com.xml
+		- Meebo.xml
+		- Orkut.xml
+		- Polymer-Project.org.xml
+		- Postini.xml
+		- WebM_Project.org.xml
+		- With_Google.com.xml
+
+	Problematic domains:
+
+		- www.goo.gl		(404; mismatched, CN: *.google.com)
+
+		- www.news.google.ca ²
+
+		- news.google.cctld **
+		- scholar.google.cctld **
+		- *-opensocial.googleusercontent.com ***
+
+	² Mismatched, CN: google.com
+	**** $ 404s
+	* 404, valid cert
+	** Redirects to http, valid cert
+	*** Breaks followers widget - https://trac.torproject.org/projects/tor/ticket/7294
+
+
+	Partially covered domains:
+
+		- google.cctld subdomains:
+
+			- scholar	(→ www)
+
+		- *.googleusercontent.com	(*-opensocial excluded)
+
+
+	Fully covered domains:
+
+		- lh[3-6].ggpht.com
+		- (www.)goo.gl		(www → ^)
+
+		- partner.googleadservices.com
+		- (www.)googlecode.com
+		- *.googlecode.com	(per-project subdomains)
+		- googlesource.com
+		- *.googlesource.com
+		- pagead2.googlesyndication.com
+		- tpc.googlesyndication.com
+		- mail-attachment.googleusercontent.com
+		- webcache.googleusercontent.com
+-->
+<ruleset name="Google Services">
+	<target host="*.ggpht.com" />
+	<target host="goo.gl" />
+	<target host="www.goo.gl" />
+	<target host="accounts.google.*" />
+	<target host="adwords.google.*" />
+	<target host="finance.google.*" />
+	<target host="groups.google.*" />
+	<target host="it.google.*" />
+	<target host="news.google.*" />
+		<exclusion pattern="^http://(news\.)?google\.((?:com?\.)?\w{2,3})/(archivesearch|newspapers)" />
+			<test url="http://news.google.ca/archivesearch" />
+			<test url="http://news.google.com/archivesearch" />
+			<test url="http://news.google.com.au/archivesearch" />
+			<test url="http://news.google.ca/newspapers" />
+			<test url="http://news.google.com/newspapers" />
+			<test url="http://news.google.com.au/newspapers" />
+	<target host="picasaweb.google.*" />
+	<target host="scholar.google.*" />
+	<target host="*.google.ca" />
+	<target host="accounts.google.co.*" />
+	<target host="adwords.google.co.*" />
+	<target host="finance.google.co.*" />
+	<target host="groups.google.co.*" />
+	<target host="id.google.co.*" />
+	<target host="news.google.co.*" />
+	<target host="picasaweb.google.co.*" />
+	<target host="scholar.google.co.*" />
+	<target host="*.google.com" />
+		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
+			<test url="http://cbks0.google.com/" />
+			<test url="http://cbks0.google.com/?" />
+			<test url="http://cbks0.google.com/?foo" />
+		<exclusion pattern="^http://gg\.google\.com/(?!csi(?:$|\?))" />
+			<test url="http://gg.google.com/" />
+			<test url="http://gg.google.com/foo" />
+			<test url="http://gg.google.com/foo?" />
+			<test url="http://gg.google.com/foo?bar" />
+	<target host="accounts.google.com.*" />
+	<target host="adwords.google.com.*" />
+	<target host="groups.google.com.*" />
+	<target host="id.google.com.*" />
+	<target host="news.google.com.*" />
+	<target host="picasaweb.google.com.*" />
+	<target host="scholar.google.com.*" />
+	<target host="googlecode.com" />
+	<target host="*.googlecode.com" />
+	<target host="googlesource.com" />
+	<target host="*.googlesource.com" />
+	<target host="*.googlesyndication.com" />
+	<target host="*.googleusercontent.com" />
+	<target host="*.corp.googleusercontent.com" />
+		<!--
+			Necessary for the Followers widget:
+
+				 https://trac.torproject.org/projects/tor/ticket/7294
+											-->
+		<exclusion pattern="http://[^@:\./]+-opensocial\.googleusercontent\.com" />
+			<test url="http://foo-opensocial.googleusercontent.com" />
+			<test url="http://bar-opensocial.googleusercontent.com" />
+			<test url="http://foobar-opensocial.googleusercontent.com" />
+
+
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
+	<!--
+		Can we secure any of these wildcard cookies safely?
+									-->
+	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
+	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
+	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
+	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
+	<securecookie host="^mail-attachment\.googleusercontent\.com$" name=".+" />
+
+	<!--    - lh 3-6 exist
+		- All appear identical
+		- Identical to lh\d.googleusercontent.com
+					-->
+	<rule from="^http://lh(\d)\.ggpht\.com/"
+		to="https://lh$1.ggpht.com/" />
+		<test url="http://lh3.ggpht.com/" />
+		<test url="http://lh4.ggpht.com/" />
+		<test url="http://lh5.ggpht.com/" />
+		<test url="http://lh6.ggpht.com/" />
+
+	<rule from="^http://(www\.)?goo\.gl/"
+		to="https://goo.gl/" />
+		<test url="http://www.goo.gl/" />
+		<test url="http://goo.gl/" />
+
+	<!--	Subdomains that work on all in google.*
+							-->
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
+		to="https://$1.google.$2/" />
+		<test url="http://accounts.google.ca/" />
+		<test url="http://accounts.google.com/" />
+		<test url="http://accounts.google.com.au/" />
+		<test url="http://adwords.google.ca/" />
+		<test url="http://adwords.google.com/" />
+		<test url="http://adwords.google.com.au/" />
+		<test url="http://finance.google.ca/" />
+		<test url="http://finance.google.com/" />
+		<test url="http://finance.google.com.au/" />
+		<test url="http://groups.google.ca/" />
+		<test url="http://groups.google.com/" />
+		<test url="http://groups.google.com.au/" />
+		<test url="http://id.google.ca/" />
+		<test url="http://id.google.com/" />
+		<test url="http://id.google.com.au/" />
+		<test url="http://lh3.google.ca/" />
+		<test url="http://lh4.google.com/" />
+		<test url="http://lh5.google.com.au/" />
+		<test url="http://m.google.ca/" />
+		<test url="http://m.google.com/" />
+		<test url="http://m.google.com.au/" />
+		<test url="http://picasaweb.google.ca/" />
+		<test url="http://picasaweb.google.com/" />
+		<test url="http://picasaweb.google.com.au/" />
+
+	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
+		to="https://www.google.$1/intl/" />
+		<test url="http://scholar.google.ca/intl/" />
+		<test url="http://scholar.google.com/intl/" />
+		<test url="http://scholar.google.com.au/intl/" />
+
+	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
+		to="https://www.google.com/news" />
+		<test url="http://news.google.ca/" />
+		<test url="http://news.google.ca/news" />
+		<test url="http://news.google.ca/newshp" />
+		<test url="http://news.google.com/" />
+		<test url="http://news.google.com/news" />
+		<test url="http://news.google.com/newshp" />
+		<test url="http://news.google.com.au/" />
+		<test url="http://news.google.com.au/news" />
+		<test url="http://news.google.com.au/newshp" />
+
+	<!-- wildcards -->
+
+	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"
+		to="https://$1.googleusercontent.com/" />
+		<test url="http://webcache.googleusercontent.com/" />
+		<test url="http://foo.googleusercontent.com/" />
+		<test url="http://bar.googleusercontent.com/" />
+
+	<rule from="^http://([^/:@\.]+\.)?googlecode\.com/"
+		 to="https://$1googlecode.com/" />
+		<test url="http://foo.googlecode.com/" />
+		<test url="http://bar.googlecode.com/" />
+		<test url="http://www.googlecode.com/" />
+
+	<rule from="^http://([^@:\./]+\.)?googlesource\.com/"
+		to="https://$1googlesource.com/" />
+		<test url="http://foo.googlesource.com/" />
+		<test url="http://bar.googlesource.com/" />
+		<test url="http://www.googlesource.com/" />
+</ruleset>
diff --git a/src/chrome/content/rules/GoogleServices_Simple.xml b/src/chrome/content/rules/GoogleServices_Simple.xml
deleted file mode 100644
index ed14063cb473..000000000000
--- a/src/chrome/content/rules/GoogleServices_Simple.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-	Rules that are simple to write go in here, for everything else
-	See GoogleServices.xml
-
-	Other Google rulesets:
-
-		- See GoogleServices.xml for the list
--->
-<ruleset name="Google Services Simple">
-	<target host="partner.googleadservices.com" />
-	<target host="pagead2.googlesyndication.com" />
-	<target host="tpc.googlesyndication.com" />
-
-	<target host="googletagmanager.com" />
-	<target host="www.googletagmanager.com" />
-
-	<!-- Gmail -->
-	<target host="gmail.com" />
-		<target host="www.gmail.com" />
-	<target host="googlemail.com" />
-		<target host="www.googlemail.com" />
-	<securecookie host="^gmail\.com$" name=".+" />
-	<securecookie host="^www\.gmail\.com$" name=".+" />
-	<securecookie host="^googlemail\.com$" name=".+" />
-	<securecookie host="^www\.googlemail\.com$" name=".+" />
-
-	<!-- !www doesn't exist -->
-	<target host="www.googletagservices.com" />
-
-	<rule from="^http:"
-			to="https:" />
-</ruleset>
\ No newline at end of file

From 1837b24d299a6b5486878d3e32d517090be3c934 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 16:39:28 +1100
Subject: [PATCH 52/77] Reworded comments. Simplified Google.org.xml

---
 src/chrome/content/rules/Google-mismatches.xml |  3 ++-
 src/chrome/content/rules/Google.org.xml        | 10 +++-------
 src/chrome/content/rules/Google.xml            |  6 ++----
 src/chrome/content/rules/GoogleAPIs.xml        |  2 +-
 src/chrome/content/rules/GoogleSearch.xml      |  3 +--
 src/chrome/content/rules/GoogleServices.xml    |  4 +---
 6 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/src/chrome/content/rules/Google-mismatches.xml b/src/chrome/content/rules/Google-mismatches.xml
index fe0087383676..9c90aaa94f2f 100644
--- a/src/chrome/content/rules/Google-mismatches.xml
+++ b/src/chrome/content/rules/Google-mismatches.xml
@@ -1,5 +1,6 @@
 <!--
-
+	For other Google coverage, see GoogleServices.xml.
+	
 	Problematic domains:
 
 		- (www.)apture.com	(works, mismatched, CN: *.google.com)
diff --git a/src/chrome/content/rules/Google.org.xml b/src/chrome/content/rules/Google.org.xml
index d6cc47881ba2..43f3916f70b0 100644
--- a/src/chrome/content/rules/Google.org.xml
+++ b/src/chrome/content/rules/Google.org.xml
@@ -1,14 +1,10 @@
 <!--
-	For other Google coverage, see GoogleServices.xml.
-
+	For other Google coverage, see GoogleServices.xml
 -->
 <ruleset name="Google.org">
-
 	<target host="google.org" />
 	<target host="www.google.org" />
 
-
-	<rule from="^http://(www\.)?google\.org/"
-		to="https://$1google.org/" />
-
+	<rule from="^http:"
+			to="https:" />
 </ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index ca556c8b2a76..af5e4fda4e27 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -1,8 +1,6 @@
 <!--
-	This ruleset only overs (www.)?google.tld
-	Other Google rulesets:
-
-		- See GoogleServices.xml for the list
+	This ruleset only covers (www.)?google.tld
+	For other Google coverage, see GoogleServices.xml
 
 	Nonfunctional google.com paths:
 
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 85a5a8081553..001510d74f63 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -1,5 +1,5 @@
 <!--
-	For other Google coverage, see GoogleServices.xml.
+	For other Google coverage, see GoogleServices.xml
 
 
 	Nonfunctional domains:
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index b951a5d53d2f..6e8ac865efc2 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -1,6 +1,5 @@
 <!--
-	Other Google rulesets:
-		- See GoogleServices.xml for the list
+	For other Google coverage, see GoogleServices.xml
 -->
 <ruleset name="Google Search">
 	<target host="google.*" />
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index ed14063cb473..5330a43727c9 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -2,9 +2,7 @@
 	Rules that are simple to write go in here, for everything else
 	See GoogleServices.xml
 
-	Other Google rulesets:
-
-		- See GoogleServices.xml for the list
+	For other Google coverage, see GoogleServices.xml
 -->
 <ruleset name="Google Services Simple">
 	<target host="partner.googleadservices.com" />

From 3060625198d1e9bd9720af2b74b4c892d0b8a2a0 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 16:43:55 +1100
Subject: [PATCH 53/77] Moves paths out of GoogleAPIs.xml to Google.xml

---
 src/chrome/content/rules/Google.xml     | 18 ++++++++++++++++++
 src/chrome/content/rules/GoogleAPIs.xml |  7 -------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index af5e4fda4e27..5b2046f08362 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -51,6 +51,7 @@
 		<test url="http://www.google.ca/custom" />
 		<test url="http://www.google.com/custom" />
 		<test url="http://www.google.com.au/custom" />
+		
 	<!--   Paths that 404 on .ccltd, but work on .com:   -->
 	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
 		 	to="https://www.google.com/" />
@@ -251,6 +252,23 @@
 	<test url="http://www.google.com/webmasters" />
 	<test url="http://www.google.com.au/webmasters" />
 
+<!--	jsapi was causing problems on some sites that embed google maps:
+	https://trac.torproject.org/projects/tor/ticket/2335
+	Apparently now fixed; thanks, Google!
+						-->
+<rule from="^http://(www\.)?google\.com/(afsonline/|chart|jsapi|recaptcha/|uds)"
+	to="https://www.google.com/$2" />
+	<test url="http://google.com/afsonline/" />
+	<test url="http://google.com/chart" />
+	<test url="http://google.com/jsapi" />
+	<test url="http://google.com/recaptcha/" />
+	<test url="http://google.com/uds" />
+	<test url="http://www.google.com/afsonline/" />
+	<test url="http://www.google.com/chart" />
+	<test url="http://www.google.com/jsapi" />
+	<test url="http://www.google.com/recaptcha/" />
+	<test url="http://www.google.com/uds" />
+
 <!--   Paths that only exist/work on .com   -->
 	<test url="http://google.com/" />
 	<test url="http://www.google.com/" />
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index 001510d74f63..f774482b1e22 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -94,13 +94,6 @@
 	<rule from="^http://(?:www\.)?gmodules\.com/ig/images/"
 		to="https://www.google.com/ig/images/" />
 
-	<!--	jsapi was causing problems on some sites that embed google maps:
-		https://trac.torproject.org/projects/tor/ticket/2335
-		Apparently now fixed; thanks, Google!
-							-->
-	<rule from="^http://(?:www\.)?google\.com/(afsonline/|chart|jsapi|recaptcha/|uds)"
-		to="https://www.google.com/$1" />
-
 	<rule from="^http://(api|[\w-]+\.client)s\.google\.com/"
 		to="https://$1s.google.com/" />
 

From ce7430159c8f5e891130476093127d70b6c7415d Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 16:51:43 +1100
Subject: [PATCH 54/77] Moved subdomains from GoogleAPIs.xml to
 Google.com_Subdomains & Google.com_Subdomains_Complex

---
 .../content/rules/Google.com_Subdomains.xml      |  7 +++----
 .../rules/Google.com_Subdomains_Complex.xml      | 10 ++++++++++
 src/chrome/content/rules/GoogleAPIs.xml          | 16 +---------------
 3 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 0b9578d3fb20..a051ce065f73 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -46,10 +46,8 @@
 -->
 <ruleset name="Google.com Subdomains">
 	<target host="admin.google.com" />
-	<!--
-		apis.google.com
-		Covered in GoogleAPIs.xml
-	-->
+	<target host="apis.google.com" />
+		<!-- See the complex ruleset for chart.apis -->
 	<target host="appengine.google.com" />
 	<target host="calendar.google.com" />
 	<target host="cast.google.com" />
@@ -60,6 +58,7 @@
 	<target host="chrome.google.com" />
 	<target host="clients.google.com" />
 		<!-- See the complex ruleset for clients\d -->
+		<!-- See the complex ruleset for *.clients\d -->
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
 		<!-- See GoogleSearch.xml for codesearch -->
diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
index af96b239220c..04319d012c86 100644
--- a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -55,4 +55,14 @@
 		<test url="http://tbn1.google.com/" />
 		<test url="http://tbn2.google.com/" />
 		<test url="http://tbn3.google.com/" />
+
+	<rule from="^http://chart\.apis\.google\.com/chart"
+	to="https://chart.googleapis.com/chart" />
+		<test url="http://chat.apis.google.com/chart" />
+
+	<rule from="^http://([\w-]+)\.clients\.google\.com/"
+		to="https://$1.clients.google.com/" />
+		<test url="https://foo.clients.google.com/bar" />
+		<test url="https://bar.clients.google.com/" />
+		<test url="https://foobar.clients.google.com/foobar" />
 </ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index f774482b1e22..a31a28c58fef 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -66,18 +66,13 @@
 
 -->
 <ruleset name="Google APIs">
-
 	<target host="gmodules.com" />
 	<target host="www.gmodules.com" />
-	<target host="google.com" />
-	<target host="apis.google.com" />
-	<target host="*.apis.google.com" />
-	<target host="*.clients.google.com" />
-	<target host="www.google.com" />
 	<target host="*.google-analytics.com" />
 	<target host="*.googleapis.com" />
 	<target host="gstatic.com" />
 	<target host="*.gstatic.com" />
+
 	<!--	Captive portal detection redirects to this URL, and many captive
 		portals break TLS, so exempt this redirect URL.
 		See GitHub bug #368
@@ -87,19 +82,11 @@
 	<target host="gdata.youtube.com" />
 		<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
 
-
 	<securecookie host="^ssl\.google-analytics\.com$" name=".+" />
 
-
 	<rule from="^http://(?:www\.)?gmodules\.com/ig/images/"
 		to="https://www.google.com/ig/images/" />
 
-	<rule from="^http://(api|[\w-]+\.client)s\.google\.com/"
-		to="https://$1s.google.com/" />
-
-	<rule from="^http://chart\.apis\.google\.com/chart"
-		to="https://chart.googleapis.com/chart" />
-
 	<rule from="^http://(ssl|www)\.google-analytics\.com/"
 		to="https://$1.google-analytics.com/" />
 
@@ -132,5 +119,4 @@
 
 	<rule from="^http://gdata\.youtube\.com/"
 		to="https://gdata.youtube.com/" />
-
 </ruleset>

From e0b56d59ceeaf43cbb36c2689e59205ee9ecb1c4 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 17:00:59 +1100
Subject: [PATCH 55/77] [GoogleAPIs] Added test urls

---
 src/chrome/content/rules/GoogleAPIs.xml | 29 ++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index a31a28c58fef..bd8d203dc54e 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -72,15 +72,19 @@
 	<target host="*.googleapis.com" />
 	<target host="gstatic.com" />
 	<target host="*.gstatic.com" />
+	<target host="api.recaptcha.net" />
+	<target host="api-secure.recaptcha.net" />
+	<target host="gdata.youtube.com" />
 
 	<!--	Captive portal detection redirects to this URL, and many captive
 		portals break TLS, so exempt this redirect URL.
 		See GitHub bug #368
-							-->
-		<exclusion pattern="^http://www\.gstatic\.com/generate_204" />
-	<target host="*.recaptcha.net" />
-	<target host="gdata.youtube.com" />
-		<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
+			-->
+	<exclusion pattern="^http://www\.gstatic\.com/generate_204" />
+		<test url="htttp://www.gstatic.com/generate_204" />
+
+	<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
+		<test url="http://gdata.youtube.com/crossdomain.xml" />
 
 	<securecookie host="^ssl\.google-analytics\.com$" name=".+" />
 
@@ -105,11 +109,24 @@
 			With &strip=1, the cached page will be text-only and
 		will come exclusively from Google's HTTPS server.
 									-->
-	<rule from="^http://(?:www\.)?gstatic\.com/"
+	<rule from="^http://(www\.)?gstatic\.com/"
 		to="https://www.gstatic.com/" />
+		<test url="http://www.gstatic.com/" />
 
 	<rule from="^http://(csi|encrypted-tbn\d|g0|[\w-]+\.metric|ssl|t\d)\.gstatic\.com/"
 		to="https://$1.gstatic.com/" />
+		<test url="http://csi.gstatic.com/" />
+		<test url="http://encrypted-tbn1.gstatic.com/" />
+		<test url="http://encrypted-tbn2.gstatic.com/" />
+		<test url="http://encrypted-tbn3.gstatic.com/" />
+		<test url="http://g0.gstatic.com/" />
+		<test url="http://test1-ds.metric.gstatic.com/" />
+		<test url="http://test2-ds.metric.gstatic.com/" />
+		<test url="http://test3-ds.metric.gstatic.com/" />
+		<test url="http://ssl.gstatic.com/" />
+		<test url="http://t1.gstatic.com/" />
+		<test url="http://t2.gstatic.com/" />
+		<test url="http://t3.gstatic.com/" />
 
 	<rule from="^http://api\.recaptcha\.net/"
 		to="https://www.google.com/recaptcha/api/" />

From 656cb37eb02cca3641a61c770a149d1831ce9e0c Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 17:07:54 +1100
Subject: [PATCH 56/77] Moving stuff from GoogleSearch.xml into where they
 should belong

---
 .../content/rules/Google.com_Subdomains.xml   |  2 +-
 .../rules/Google.com_Subdomains_Complex.xml   |  4 +++
 src/chrome/content/rules/Google.xml           | 21 +++++++++++++++-
 src/chrome/content/rules/GoogleSearch.xml     | 25 -------------------
 4 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index a051ce065f73..261406a4babc 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -61,7 +61,7 @@
 		<!-- See the complex ruleset for *.clients\d -->
 	<target host="cloud.google.com" />
 	<target host="code.google.com" />
-		<!-- See GoogleSearch.xml for codesearch -->
+		<!-- See the complex ruleset for codesearch -->
 	<target host="corp.google.com" />
 		<target host="*.corp.google.com" />
 		<!-- See the wildcard section -->
diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
index 04319d012c86..4ab125e37411 100644
--- a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -65,4 +65,8 @@
 		<test url="https://foo.clients.google.com/bar" />
 		<test url="https://bar.clients.google.com/" />
 		<test url="https://foobar.clients.google.com/foobar" />
+
+	<rule from="^http://codesearch\.google\.com/"
+		to="https://www.google.com/codesearch/" />
+		<test url="http://codesearch.google.com/" />
 </ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 5b2046f08362..bd6919f18529 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -53,11 +53,14 @@
 		<test url="http://www.google.com.au/custom" />
 		
 	<!--   Paths that 404 on .ccltd, but work on .com:   -->
-	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
+	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|codesearch|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
 		 	to="https://www.google.com/" />
 		<test url="http://www.google.ca/calendar" />
 		<test url="http://www.google.com/calendar" />
 		<test url="http://www.google.com.au/calendar" />
+		<test url="http://www.google.ca/codesearch" />
+		<test url="http://www.google.com/codesearch" />
+		<test url="http://www.google.com.au/codesearch" />
 		<test url="http://www.google.ca/dictionary" />
 		<test url="http://www.google.com/dictionary" />
 		<test url="http://www.google.com.au/dictionary" />
@@ -287,4 +290,20 @@
 	<test url="http://www.google.com/safebrowsing" />
 	<test url="http://www.google.com/videotargetting" />
 	<test url="http://www.google.com/webfonts" />
+
+	<!-- 404s when using HTTPS -->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/firefox/?"
+		to="https://www.google.$2/" />
+		<test url="http://google.ca/firefox" />
+		<test url="http://google.com/firefox" />
+		<test url="http://google.com.au/firefox" />
+		<test url="http://www.google.ca/firefox" />
+		<test url="http://www.google.com/firefox" />
+		<test url="http://www.google.com.au/firefox" />
+		<test url="http://google.ca/firefox/" />
+		<test url="http://google.com/firefox/" />
+		<test url="http://google.com.au/firefox/" />
+		<test url="http://www.google.ca/firefox/" />
+		<test url="http://www.google.com/firefox/" />
+		<test url="http://www.google.com.au/firefox/" />
 </ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
index 6e8ac865efc2..3f38c1e11006 100644
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ b/src/chrome/content/rules/GoogleSearch.xml
@@ -34,20 +34,6 @@
 		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch" />
 		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch&amp;something=baz" />
 
-	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/firefox/?"
-		to="https://www.google.$2/" />
-		<test url="http://google.ca/firefox" />
-		<test url="http://google.com/firefox" />
-		<test url="http://google.com.au/firefox" />
-		<test url="http://www.google.ca/firefox" />
-		<test url="http://www.google.com/firefox" />
-		<test url="http://www.google.com.au/firefox" />
-		<test url="http://google.ca/firefox/" />
-		<test url="http://google.com/firefox/" />
-		<test url="http://google.com.au/firefox/" />
-		<test url="http://www.google.ca/firefox/" />
-		<test url="http://www.google.com/firefox/" />
-		<test url="http://www.google.com.au/firefox/" />
 	<!-- Paths -->
 	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(about|search|setprefs|teapot|webhp)"
 		to="https://www.google.$2/$3" />
@@ -84,15 +70,4 @@
 		<test url="http://www.google.ca/webhp" />
 		<test url="http://www.google.com/webhp" />
 		<test url="http://www.google.com.au/webhp" />
-
-	<!-- This doesn't exist anymore, but still rewriting to prevent old queries from being leaked -->
-	<rule from="^http://codesearch\.google\.com/"
-		to="https://www.google.com/codesearch/" />
-		<test url="http://codesearch.google.com/" />
-
-	<rule from="^http://(www\.)?google\.com/codesearch"
-		to="https://www.google.com/codesearch" />
-		<test url="http://google.com/codesearch" />
-		<test url="http://www.google.com/codesearch" />
-
 </ruleset>

From b7dc7a63c5f3871722aaaa03ca61a0686110023e Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 22 Feb 2015 21:53:23 +1100
Subject: [PATCH 57/77] Merged GoogleSearch.xml -> Google.xml

---
 src/chrome/content/rules/Google.xml       | 423 ++++++++++++----------
 src/chrome/content/rules/GoogleSearch.xml |  73 ----
 2 files changed, 227 insertions(+), 269 deletions(-)
 delete mode 100644 src/chrome/content/rules/GoogleSearch.xml

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index bd6919f18529..abea84d93731 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -53,14 +53,11 @@
 		<test url="http://www.google.com.au/custom" />
 		
 	<!--   Paths that 404 on .ccltd, but work on .com:   -->
-	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|codesearch|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
+	<rule from="^https?://(?:www\.)?google\.(?:com?\.)?\w{2,3}/(?=calendar|dictionary|doubleclick|foobar|help|ideas|pacman|partners|postini|powermeter|url|webdesigner)"
 		 	to="https://www.google.com/" />
 		<test url="http://www.google.ca/calendar" />
 		<test url="http://www.google.com/calendar" />
 		<test url="http://www.google.com.au/calendar" />
-		<test url="http://www.google.ca/codesearch" />
-		<test url="http://www.google.com/codesearch" />
-		<test url="http://www.google.com.au/codesearch" />
 		<test url="http://www.google.ca/dictionary" />
 		<test url="http://www.google.com/dictionary" />
 		<test url="http://www.google.com.au/dictionary" />
@@ -95,201 +92,235 @@
 		<test url="http://www.google.com/webdesigner" />
 		<test url="http://www.google.com.au/webdesigner" />
 
-<!--   Paths that work on all in google.*   -->
-<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/"
-	 to="https://www.google.$1/" />
-	<test url="http://www.google.ca/accounts" />
-	<test url="http://www.google.com/accounts" />
-	<test url="http://www.google.com.au/accounts" />
-	<test url="http://www.google.ca/adplanner" />
-	<test url="http://www.google.com/adplanner" />
-	<test url="http://www.google.com.au/adplanner" />
-	<test url="http://www.google.ca/ads" />
-	<test url="http://www.google.com/ads" />
-	<test url="http://www.google.com.au/ads" />
-	<test url="http://www.google.ca/adsense" />
-	<test url="http://www.google.com/adsense" />
-	<test url="http://www.google.com.au/adsense" />
-	<test url="http://www.google.ca/adwords" />
-	<test url="http://www.google.com/adwords" />
-	<test url="http://www.google.com.au/adwords" />
-	<test url="http://www.google.ca/analytics" />
-	<test url="http://www.google.com/analytics" />
-	<test url="http://www.google.com.au/analytics" />
-	<test url="http://www.google.ca/bookmarks" />
-	<test url="http://www.google.com/bookmarks" />
-	<test url="http://www.google.com.au/bookmarks" />
-	<test url="http://www.google.ca/books" />
-	<test url="http://www.google.com/books" />
-	<test url="http://www.google.com.au/books" />
-	<test url="http://www.google.ca/chrome" />
-	<test url="http://www.google.com/chrome" />
-	<test url="http://www.google.com.au/chrome" />
-	<test url="http://www.google.ca/chromecast" />
-	<test url="http://www.google.com/chromecast" />
-	<test url="http://www.google.com.au/chromecast" />
-	<test url="http://www.google.ca/contacts" />
-	<test url="http://www.google.com/contacts" />
-	<test url="http://www.google.com.au/contacts" />
-	<test url="http://www.google.ca/coop" />
-	<test url="http://www.google.com/coop" />
-	<test url="http://www.google.com.au/coop" />
-	<test url="http://www.google.ca/cse" />
-	<test url="http://www.google.com/cse" />
-	<test url="http://www.google.com.au/cse" />
-	<test url="http://www.google.ca/css" />
-	<test url="http://www.google.com/css" />
-	<test url="http://www.google.com.au/css" />
-	<test url="http://www.google.ca/culturalinstitute" />
-	<test url="http://www.google.com/culturalinstitute" />
-	<test url="http://www.google.com.au/culturalinstitute" />
-	<test url="http://www.google.ca/doodles" />
-	<test url="http://www.google.com/doodles" />
-	<test url="http://www.google.com.au/doodles" />
-	<test url="http://www.google.ca/earth" />
-	<test url="http://www.google.com/earth" />
-	<test url="http://www.google.com.au/earth" />
-	<test url="http://www.google.ca/favicon.ico" />
-	<test url="http://www.google.com/favicon.ico" />
-	<test url="http://www.google.com.au/favicon.ico" />
-	<test url="http://www.google.ca/finance" />
-	<test url="http://www.google.com/finance" />
-	<test url="http://www.google.com.au/finance" />
-	<test url="http://www.google.ca/get" />
-	<test url="http://www.google.com/get" />
-	<test url="http://www.google.com.au/get" />
-	<test url="http://www.google.ca/goodtoknow" />
-	<test url="http://www.google.com/goodtoknow" />
-	<test url="http://www.google.com.au/goodtoknow" />
-	<test url="http://www.google.ca/googleblogs" />
-	<test url="http://www.google.com/googleblogs" />
-	<test url="http://www.google.com.au/googleblogs" />
-	<test url="http://www.google.ca/grants" />
-	<test url="http://www.google.com/grants" />
-	<test url="http://www.google.com.au/grants" />
-	<test url="http://www.google.ca/green" />
-	<test url="http://www.google.com/green" />
-	<test url="http://www.google.com.au/green" />
-	<test url="http://www.google.ca/hangouts" />
-	<test url="http://www.google.com/hangouts" />
-	<test url="http://www.google.com.au/hangouts" />
-	<test url="http://www.google.ca/hostednews" />
-	<test url="http://www.google.com/hostednews" />
-	<test url="http://www.google.com.au/hostednews" />
-	<test url="http://www.google.ca/images" />
-	<test url="http://www.google.com/images" />
-	<test url="http://www.google.com.au/images" />
-	<test url="http://www.google.ca/intl" />
-	<test url="http://www.google.com/intl" />
-	<test url="http://www.google.com.au/intl" />
-	<test url="http://www.google.ca/js" />
-	<test url="http://www.google.com/js" />
-	<test url="http://www.google.com.au/js" />
-	<test url="http://www.google.ca/landing" />
-	<test url="http://www.google.com/landing" />
-	<test url="http://www.google.com.au/landing" />
-	<test url="http://www.google.ca/logos" />
-	<test url="http://www.google.com/logos" />
-	<test url="http://www.google.com.au/logos" />
-	<test url="http://www.google.ca/mapmaker" />
-	<test url="http://www.google.com/mapmaker" />
-	<test url="http://www.google.com.au/mapmaker" />
-	<test url="http://www.google.ca/mobile" />
-	<test url="http://www.google.com/mobile" />
-	<test url="http://www.google.com.au/mobile" />
-	<test url="http://www.google.ca/newproducts" />
-	<test url="http://www.google.com/newproducts" />
-	<test url="http://www.google.com.au/newproducts" />
-	<test url="http://www.google.ca/news" />
-	<test url="http://www.google.com/news" />
-	<test url="http://www.google.com.au/news" />
-	<test url="http://www.google.ca/nexus" />
-	<test url="http://www.google.com/nexus" />
-	<test url="http://www.google.com.au/nexus" />
-	<test url="http://www.google.ca/patents" />
-	<test url="http://www.google.com/patents" />
-	<test url="http://www.google.com.au/patents" />
-	<test url="http://www.google.ca/policies" />
-	<test url="http://www.google.com/policies" />
-	<test url="http://www.google.com.au/policies" />
-	<test url="http://www.google.ca/prdhp" />
-	<test url="http://www.google.com/prdhp" />
-	<test url="http://www.google.com.au/prdhp" />
-	<test url="http://www.google.ca/profiles" />
-	<test url="http://www.google.com/profiles" />
-	<test url="http://www.google.com.au/profiles" />
-	<test url="http://www.google.ca/products" />
-	<test url="http://www.google.com/products" />
-	<test url="http://www.google.com.au/products" />
-	<test url="http://www.google.ca/reader" />
-	<test url="http://www.google.com/reader" />
-	<test url="http://www.google.com.au/reader" />
-	<test url="http://www.google.ca/s2" />
-	<test url="http://www.google.com/s2" />
-	<test url="http://www.google.com.au/s2" />
-	<test url="http://www.google.ca/script" />
-	<test url="http://www.google.com/script" />
-	<test url="http://www.google.com.au/script" />
-	<test url="http://www.google.ca/settings" />
-	<test url="http://www.google.com/settings" />
-	<test url="http://www.google.com.au/settings" />
-	<test url="http://www.google.ca/shopping" />
-	<test url="http://www.google.com/shopping" />
-	<test url="http://www.google.com.au/shopping" />
-	<test url="http://www.google.ca/support" />
-	<test url="http://www.google.com/support" />
-	<test url="http://www.google.com.au/support" />
-	<test url="http://www.google.ca/tools" />
-	<test url="http://www.google.com/tools" />
-	<test url="http://www.google.com.au/tools" />
-	<test url="http://www.google.ca/transparencyreport" />
-	<test url="http://www.google.com/transparencyreport" />
-	<test url="http://www.google.com.au/transparencyreport" />
-	<test url="http://www.google.ca/trends" />
-	<test url="http://www.google.com/trends" />
-	<test url="http://www.google.com.au/trends" />
-	<test url="http://www.google.ca/urchin" />
-	<test url="http://www.google.com/urchin" />
-	<test url="http://www.google.com.au/urchin" />
-	<test url="http://www.google.ca/webmasters" />
-	<test url="http://www.google.com/webmasters" />
-	<test url="http://www.google.com.au/webmasters" />
+	<!-- The site's main page -->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(?=#|\?|$)"
+		to="https://www.google.$2/" />
+		<test url="http://google.ca/" />
+		<test url="http://google.com/" />
+		<test url="http://google.com.au/" />
+		<test url="http://www.google.ca/#" />
+		<test url="http://www.google.com/#" />
+		<test url="http://www.google.com.au/#" />
+		<test url="http://www.google.ca/?" />
+		<test url="http://www.google.com/?" />
+		<test url="http://www.google.com.au/?" />
+
+	<!--   Paths that work on all in google.*   -->
+	<rule from="^http://(?:www\.)?google\.((?:com?\.)?\w{2,3})/(?=about|accounts|adplanner|ads|adsense|adwords|analytics|bookmarks|books|chrome|chromecast|contacts|coop|cse|css|culturalinstitute|doodles|earth|favicon.ico|finance|get|goodtoknow|googleblogs|grants|green|hangouts|hostednews|images|intl|js|landing|logos|mapmaker|mobile|newproducts|news|nexus|patents|policies|prdhp|profiles|products|reader|s2|script|search|setprefs|settings|shopping|support|teapot|tools|transparencyreport|trends|urchin|webhp|webmasters)"
+		 to="https://www.google.$1/" />
+		<test url="http://www.google.ca/about" />
+		<test url="http://www.google.com/about" />
+		<test url="http://www.google.com.au/about" />
+		<test url="http://www.google.ca/accounts" />
+		<test url="http://www.google.com/accounts" />
+		<test url="http://www.google.com.au/accounts" />
+		<test url="http://www.google.ca/adplanner" />
+		<test url="http://www.google.com/adplanner" />
+		<test url="http://www.google.com.au/adplanner" />
+		<test url="http://www.google.ca/ads" />
+		<test url="http://www.google.com/ads" />
+		<test url="http://www.google.com.au/ads" />
+		<test url="http://www.google.ca/adsense" />
+		<test url="http://www.google.com/adsense" />
+		<test url="http://www.google.com.au/adsense" />
+		<test url="http://www.google.ca/adwords" />
+		<test url="http://www.google.com/adwords" />
+		<test url="http://www.google.com.au/adwords" />
+		<test url="http://www.google.ca/analytics" />
+		<test url="http://www.google.com/analytics" />
+		<test url="http://www.google.com.au/analytics" />
+		<test url="http://www.google.ca/bookmarks" />
+		<test url="http://www.google.com/bookmarks" />
+		<test url="http://www.google.com.au/bookmarks" />
+		<test url="http://www.google.ca/books" />
+		<test url="http://www.google.com/books" />
+		<test url="http://www.google.com.au/books" />
+		<test url="http://www.google.ca/chrome" />
+		<test url="http://www.google.com/chrome" />
+		<test url="http://www.google.com.au/chrome" />
+		<test url="http://www.google.ca/chromecast" />
+		<test url="http://www.google.com/chromecast" />
+		<test url="http://www.google.com.au/chromecast" />
+		<test url="http://www.google.ca/contacts" />
+		<test url="http://www.google.com/contacts" />
+		<test url="http://www.google.com.au/contacts" />
+		<test url="http://www.google.ca/coop" />
+		<test url="http://www.google.com/coop" />
+		<test url="http://www.google.com.au/coop" />
+		<test url="http://www.google.ca/cse" />
+		<test url="http://www.google.com/cse" />
+		<test url="http://www.google.com.au/cse" />
+		<test url="http://www.google.ca/css" />
+		<test url="http://www.google.com/css" />
+		<test url="http://www.google.com.au/css" />
+		<test url="http://www.google.ca/culturalinstitute" />
+		<test url="http://www.google.com/culturalinstitute" />
+		<test url="http://www.google.com.au/culturalinstitute" />
+		<test url="http://www.google.ca/doodles" />
+		<test url="http://www.google.com/doodles" />
+		<test url="http://www.google.com.au/doodles" />
+		<test url="http://www.google.ca/earth" />
+		<test url="http://www.google.com/earth" />
+		<test url="http://www.google.com.au/earth" />
+		<test url="http://www.google.ca/favicon.ico" />
+		<test url="http://www.google.com/favicon.ico" />
+		<test url="http://www.google.com.au/favicon.ico" />
+		<test url="http://www.google.ca/finance" />
+		<test url="http://www.google.com/finance" />
+		<test url="http://www.google.com.au/finance" />
+		<test url="http://www.google.ca/get" />
+		<test url="http://www.google.com/get" />
+		<test url="http://www.google.com.au/get" />
+		<test url="http://www.google.ca/goodtoknow" />
+		<test url="http://www.google.com/goodtoknow" />
+		<test url="http://www.google.com.au/goodtoknow" />
+		<test url="http://www.google.ca/googleblogs" />
+		<test url="http://www.google.com/googleblogs" />
+		<test url="http://www.google.com.au/googleblogs" />
+		<test url="http://www.google.ca/grants" />
+		<test url="http://www.google.com/grants" />
+		<test url="http://www.google.com.au/grants" />
+		<test url="http://www.google.ca/green" />
+		<test url="http://www.google.com/green" />
+		<test url="http://www.google.com.au/green" />
+		<test url="http://www.google.ca/hangouts" />
+		<test url="http://www.google.com/hangouts" />
+		<test url="http://www.google.com.au/hangouts" />
+		<test url="http://www.google.ca/hostednews" />
+		<test url="http://www.google.com/hostednews" />
+		<test url="http://www.google.com.au/hostednews" />
+		<test url="http://www.google.ca/images" />
+		<test url="http://www.google.com/images" />
+		<test url="http://www.google.com.au/images" />
+		<test url="http://www.google.ca/intl" />
+		<test url="http://www.google.com/intl" />
+		<test url="http://www.google.com.au/intl" />
+		<test url="http://www.google.ca/js" />
+		<test url="http://www.google.com/js" />
+		<test url="http://www.google.com.au/js" />
+		<test url="http://www.google.ca/landing" />
+		<test url="http://www.google.com/landing" />
+		<test url="http://www.google.com.au/landing" />
+		<test url="http://www.google.ca/logos" />
+		<test url="http://www.google.com/logos" />
+		<test url="http://www.google.com.au/logos" />
+		<test url="http://www.google.ca/mapmaker" />
+		<test url="http://www.google.com/mapmaker" />
+		<test url="http://www.google.com.au/mapmaker" />
+		<test url="http://www.google.ca/mobile" />
+		<test url="http://www.google.com/mobile" />
+		<test url="http://www.google.com.au/mobile" />
+		<test url="http://www.google.ca/newproducts" />
+		<test url="http://www.google.com/newproducts" />
+		<test url="http://www.google.com.au/newproducts" />
+		<test url="http://www.google.ca/news" />
+		<test url="http://www.google.com/news" />
+		<test url="http://www.google.com.au/news" />
+		<test url="http://www.google.ca/nexus" />
+		<test url="http://www.google.com/nexus" />
+		<test url="http://www.google.com.au/nexus" />
+		<test url="http://www.google.ca/patents" />
+		<test url="http://www.google.com/patents" />
+		<test url="http://www.google.com.au/patents" />
+		<test url="http://www.google.ca/policies" />
+		<test url="http://www.google.com/policies" />
+		<test url="http://www.google.com.au/policies" />
+		<test url="http://www.google.ca/prdhp" />
+		<test url="http://www.google.com/prdhp" />
+		<test url="http://www.google.com.au/prdhp" />
+		<test url="http://www.google.ca/profiles" />
+		<test url="http://www.google.com/profiles" />
+		<test url="http://www.google.com.au/profiles" />
+		<test url="http://www.google.ca/products" />
+		<test url="http://www.google.com/products" />
+		<test url="http://www.google.com.au/products" />
+		<test url="http://www.google.ca/reader" />
+		<test url="http://www.google.com/reader" />
+		<test url="http://www.google.com.au/reader" />
+		<test url="http://www.google.ca/s2" />
+		<test url="http://www.google.com/s2" />
+		<test url="http://www.google.com.au/s2" />
+		<test url="http://www.google.ca/script" />
+		<test url="http://www.google.com/script" />
+		<test url="http://www.google.com.au/script" />
+		<test url="http://www.google.ca/search" />
+		<test url="http://www.google.com/search" />
+		<test url="http://www.google.com.au/search" />
+		<test url="http://www.google.ca/setprefs" />
+		<test url="http://www.google.com/setprefs" />
+		<test url="http://www.google.com.au/setprefs" />
+		<test url="http://www.google.ca/settings" />
+		<test url="http://www.google.com/settings" />
+		<test url="http://www.google.com.au/settings" />
+		<test url="http://www.google.ca/shopping" />
+		<test url="http://www.google.com/shopping" />
+		<test url="http://www.google.com.au/shopping" />
+		<test url="http://www.google.ca/support" />
+		<test url="http://www.google.com/support" />
+		<test url="http://www.google.com.au/support" />
+		<test url="http://www.google.ca/teapot" />
+		<test url="http://www.google.com/teapot" />
+		<test url="http://www.google.com.au/teapot" />
+		<test url="http://www.google.ca/tools" />
+		<test url="http://www.google.com/tools" />
+		<test url="http://www.google.com.au/tools" />
+		<test url="http://www.google.ca/transparencyreport" />
+		<test url="http://www.google.com/transparencyreport" />
+		<test url="http://www.google.com.au/transparencyreport" />
+		<test url="http://www.google.ca/trends" />
+		<test url="http://www.google.com/trends" />
+		<test url="http://www.google.com.au/trends" />
+		<test url="http://www.google.ca/urchin" />
+		<test url="http://www.google.com/urchin" />
+		<test url="http://www.google.com.au/urchin" />
+		<test url="http://www.google.ca/webhp" />
+		<test url="http://www.google.com/webhp" />
+		<test url="http://www.google.com.au/webhp" />
+		<test url="http://www.google.ca/webmasters" />
+		<test url="http://www.google.com/webmasters" />
+		<test url="http://www.google.com.au/webmasters" />
 
-<!--	jsapi was causing problems on some sites that embed google maps:
-	https://trac.torproject.org/projects/tor/ticket/2335
-	Apparently now fixed; thanks, Google!
+	<!--   Paths that only exist/work on .com   -->
+	<rule from="^http://(www\.)?google\.com/(\+|afsonline|appsstatus|buzz|chat|chart|chromeos|codesearch|extern_js|glass|googlebooks|ig|insights|jsapi|moderator|phone|recaptcha|safebrowsing|uds|videotargetting|webfonts)"
+		to="https://www.google.com/$2" />
+		<test url="http://www.google.com/+" />
+		<test url="http://www.google.com/afsonline" />
+		<test url="http://www.google.com/appsstatus" />
+		<test url="http://www.google.com/buzz" />
+		<test url="http://www.google.com/chat" />
+		<test url="http://www.google.com/chart" />
+		<test url="http://www.google.com/chromeos" />
+		<test url="http://www.google.com/codesearch" />
+		<test url="http://www.google.com/extern_js" />
+		<test url="http://www.google.com/glass" />
+		<test url="http://www.google.com/googlebooks" />
+		<test url="http://www.google.com/ig" />
+		<test url="http://www.google.com/insights" />
+		<test url="http://www.google.com/jsapi" />
+		<test url="http://www.google.com/moderator" />
+		<test url="http://www.google.com/phone" />
+		<test url="http://www.google.com/recaptcha" />
+		<test url="http://www.google.com/safebrowsing" />
+		<test url="http://www.google.com/uds" />
+		<test url="http://www.google.com/videotargetting" />
+		<test url="http://www.google.com/webfonts" />
+
+	<!--	A very annoying exception that we
+		seem to need for the basic case
 						-->
-<rule from="^http://(www\.)?google\.com/(afsonline/|chart|jsapi|recaptcha/|uds)"
-	to="https://www.google.com/$2" />
-	<test url="http://google.com/afsonline/" />
-	<test url="http://google.com/chart" />
-	<test url="http://google.com/jsapi" />
-	<test url="http://google.com/recaptcha/" />
-	<test url="http://google.com/uds" />
-	<test url="http://www.google.com/afsonline/" />
-	<test url="http://www.google.com/chart" />
-	<test url="http://www.google.com/jsapi" />
-	<test url="http://www.google.com/recaptcha/" />
-	<test url="http://www.google.com/uds" />
+	<exclusion pattern="^http://(www\.)?google\.com/search.*tbs=shop" />
+		<test url="http://google.com/search?q=test&amp;tbs=shop" />
+		<test url="http://www.google.com/search?q=test&amp;tbs=shop" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbs=shop" />
 
-<!--   Paths that only exist/work on .com   -->
-	<test url="http://google.com/" />
-	<test url="http://www.google.com/" />
-	<test url="http://www.google.com/+" />
-	<test url="http://www.google.com/appsstatus" />
-	<test url="http://www.google.com/buzz" />
-	<test url="http://www.google.com/chat" />
-	<test url="http://www.google.com/chromeos" />
-	<test url="http://www.google.com/extern_js" />
-	<test url="http://www.google.com/glass" />
-	<test url="http://www.google.com/googlebooks" />
-	<test url="http://www.google.com/ig" />
-	<test url="http://www.google.com/insights" />
-	<test url="http://www.google.com/moderator" />
-	<test url="http://www.google.com/phone" />
-	<test url="http://www.google.com/safebrowsing" />
-	<test url="http://www.google.com/videotargetting" />
-	<test url="http://www.google.com/webfonts" />
+	<!--	This is necessary for image results
+		links from web search results
+						-->
+	<exclusion pattern="^http://(www\.)?google\.com/search.*tbm=isch.*" />
+		<test url="http://google.com/search?q=test&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=test&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch&amp;something=baz" />
 
 	<!-- 404s when using HTTPS -->
 	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/firefox/?"
diff --git a/src/chrome/content/rules/GoogleSearch.xml b/src/chrome/content/rules/GoogleSearch.xml
deleted file mode 100644
index 3f38c1e11006..000000000000
--- a/src/chrome/content/rules/GoogleSearch.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<!--
-	For other Google coverage, see GoogleServices.xml
--->
-<ruleset name="Google Search">
-	<target host="google.*" />
-	<target host="www.google.*" />
-
-	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(?=#|\?|$)"
-		to="https://www.google.$2/" />
-		<test url="http://google.ca/" />
-		<test url="http://google.com/" />
-		<test url="http://google.com.au/" />
-		<test url="http://www.google.ca/#" />
-		<test url="http://www.google.com/#" />
-		<test url="http://www.google.com.au/#" />
-		<test url="http://www.google.ca/?" />
-		<test url="http://www.google.com/?" />
-		<test url="http://www.google.com.au/?" />
-
-	<!--	A very annoying exception that we
-		seem to need for the basic case
-						-->
-	<exclusion pattern="^http://(www\.)?google\.com/search.*tbs=shop" />
-		<test url="http://google.com/search?q=test&amp;tbs=shop" />
-		<test url="http://www.google.com/search?q=test&amp;tbs=shop" />
-		<test url="http://www.google.com/search?q=foobar&amp;tbs=shop" />
-
-	<!--	This is necessary for image results
-		links from web search results
-						-->
-	<exclusion pattern="^http://(www\.)?google\.com/search.*tbm=isch.*" />
-		<test url="http://google.com/search?q=test&amp;tbm=isch" />
-		<test url="http://www.google.com/search?q=test&amp;tbm=isch" />
-		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch" />
-		<test url="http://www.google.com/search?q=foobar&amp;tbm=isch&amp;something=baz" />
-
-	<!-- Paths -->
-	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(about|search|setprefs|teapot|webhp)"
-		to="https://www.google.$2/$3" />
-		<test url="http://google.ca/about" />
-		<test url="http://google.com/about" />
-		<test url="http://google.com.au/about" />
-		<test url="http://www.google.ca/about" />
-		<test url="http://www.google.com/about" />
-		<test url="http://www.google.com.au/about" />
-		<test url="http://google.ca/search" />
-		<test url="http://google.com/search" />
-		<test url="http://google.com.au/search" />
-		<test url="http://www.google.ca/search" />
-		<test url="http://www.google.com/search" />
-		<test url="http://www.google.com.au/search" />
-		<test url="http://google.ca/setprefs" />
-		<test url="http://google.com/setprefs" />
-		<test url="http://google.com.au/setprefs" />
-		<test url="http://www.google.ca/setprefs" />
-		<test url="http://www.google.com/setprefs" />
-		<test url="http://www.google.com.au/setprefs" />
-		<test url="http://www.google.ca/setprefs" />
-		<test url="http://www.google.com/setprefs" />
-		<test url="http://www.google.com.au/setprefs" />
-		<test url="http://google.ca/teapot" />
-		<test url="http://google.com/teapot" />
-		<test url="http://google.com.au/teapot" />
-		<test url="http://www.google.ca/teapot" />
-		<test url="http://www.google.com/teapot" />
-		<test url="http://www.google.com.au/teapot" />
-		<test url="http://google.ca/webhp" />
-		<test url="http://google.com/webhp" />
-		<test url="http://google.com.au/webhp" />
-		<test url="http://www.google.ca/webhp" />
-		<test url="http://www.google.com/webhp" />
-		<test url="http://www.google.com.au/webhp" />
-</ruleset>

From 31887696e4b1348f0f79317767efc0b88741f9c8 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 23 Feb 2015 12:42:02 +1100
Subject: [PATCH 58/77] scholar.google.com now supports HTTPS on all paths

---
 src/chrome/content/rules/Google.com_Subdomains.xml  | 1 +
 src/chrome/content/rules/GoogleServices_Complex.xml | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 261406a4babc..52b00cd42d16 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -102,6 +102,7 @@
 	<target host="profiles.google.com" />
 	<target host="safebrowsing-cache.google.com" />
 	<target host="sb-ssl.google.com" />
+	<target host="scholar.google.com" />
 	<target host="script.google.com" />
 	<target host="security.google.com" />
 	<target host="services.google.com" />
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
index 5e15f79ee7f8..5cd50f39523e 100644
--- a/src/chrome/content/rules/GoogleServices_Complex.xml
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -188,12 +188,6 @@
 		<test url="http://picasaweb.google.com/" />
 		<test url="http://picasaweb.google.com.au/" />
 
-	<rule from="^http://scholar\.google\.((?:com?\.)?\w{2,3})/intl/"
-		to="https://www.google.$1/intl/" />
-		<test url="http://scholar.google.ca/intl/" />
-		<test url="http://scholar.google.com/intl/" />
-		<test url="http://scholar.google.com.au/intl/" />
-
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 		<test url="http://news.google.ca/" />

From 7dafed61b27e1768c438e40fca6f00467573ecc8 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 23 Feb 2015 12:54:16 +1100
Subject: [PATCH 59/77] Moving *.google.tld rules into their own ruleset for
 clarity

---
 .../content/rules/Google.com_Subdomains.xml   |  7 ++-
 .../content/rules/Google.tld_Subdomains.xml   | 46 +++++++++++++++++++
 .../content/rules/GoogleServices_Complex.xml  | 29 ------------
 3 files changed, 49 insertions(+), 33 deletions(-)
 create mode 100644 src/chrome/content/rules/Google.tld_Subdomains.xml

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 52b00cd42d16..3ef2f61d7009 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -1,7 +1,6 @@
 <!--
-	Other Google rulesets:
-		- See Google.com_Subdomains_Complex.html for rules that don't match the simple rule here
-		- See GoogleServices.xml for the list
+	See Google.com_Subdomains_Complex.html for rules that don't match the simple rule here
+	For other Google coverage, see GoogleServices.xml
 
 	Nonfunctional domains:
 
@@ -102,7 +101,7 @@
 	<target host="profiles.google.com" />
 	<target host="safebrowsing-cache.google.com" />
 	<target host="sb-ssl.google.com" />
-	<target host="scholar.google.com" />
+	<!-- see Google.tld_Subdomains.xml for scholar -->
 	<target host="script.google.com" />
 	<target host="security.google.com" />
 	<target host="services.google.com" />
diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
new file mode 100644
index 000000000000..9199786387b7
--- /dev/null
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -0,0 +1,46 @@
+<!--
+	For other Google coverage, see GoogleServices.xml
+
+	This ruleset is subdomains that exist on google.tld (not just google.com)
+-->
+<ruleset name="Google.tld Subdomains">
+	<target host="accounts.google.*" />
+	<target host="adwords.google.*" />
+	<target host="finance.google.*" />
+	<target host="groups.google.*" />
+	<target host="id.google.*" />
+	<target host="lh\d.google.*" />
+	<target host="m.google.*" />
+	<target host="picasaweb.google.*" />
+	<target host="scholar.google.*" />
+
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
+			to="https://$1.google.$2/" />
+		<test url="http://accounts.google.ca/" />
+		<test url="http://accounts.google.com/" />
+		<test url="http://accounts.google.com.au/" />
+		<test url="http://adwords.google.ca/" />
+		<test url="http://adwords.google.com/" />
+		<test url="http://adwords.google.com.au/" />
+		<test url="http://finance.google.ca/" />
+		<test url="http://finance.google.com/" />
+		<test url="http://finance.google.com.au/" />
+		<test url="http://groups.google.ca/" />
+		<test url="http://groups.google.com/" />
+		<test url="http://groups.google.com.au/" />
+		<test url="http://id.google.ca/" />
+		<test url="http://id.google.com/" />
+		<test url="http://id.google.com.au/" />
+		<test url="http://lh3.google.ca/" />
+		<test url="http://lh4.google.com/" />
+		<test url="http://lh5.google.com.au/" />
+		<test url="http://m.google.ca/" />
+		<test url="http://m.google.com/" />
+		<test url="http://m.google.com.au/" />
+		<test url="http://picasaweb.google.ca/" />
+		<test url="http://picasaweb.google.com/" />
+		<test url="http://picasaweb.google.com.au/" />
+		<test url="http://scholar.google.ca/" />
+		<test url="http://scholar.google.com/" />
+		<test url="http://scholar.google.com.au/" />
+</ruleset>
\ No newline at end of file
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
index 5cd50f39523e..172b59465ee3 100644
--- a/src/chrome/content/rules/GoogleServices_Complex.xml
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -159,35 +159,6 @@
 		<test url="http://www.goo.gl/" />
 		<test url="http://goo.gl/" />
 
-	<!--	Subdomains that work on all in google.*
-							-->
-	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|)\.google\.((?:com?\.)?\w{2,3})/"
-		to="https://$1.google.$2/" />
-		<test url="http://accounts.google.ca/" />
-		<test url="http://accounts.google.com/" />
-		<test url="http://accounts.google.com.au/" />
-		<test url="http://adwords.google.ca/" />
-		<test url="http://adwords.google.com/" />
-		<test url="http://adwords.google.com.au/" />
-		<test url="http://finance.google.ca/" />
-		<test url="http://finance.google.com/" />
-		<test url="http://finance.google.com.au/" />
-		<test url="http://groups.google.ca/" />
-		<test url="http://groups.google.com/" />
-		<test url="http://groups.google.com.au/" />
-		<test url="http://id.google.ca/" />
-		<test url="http://id.google.com/" />
-		<test url="http://id.google.com.au/" />
-		<test url="http://lh3.google.ca/" />
-		<test url="http://lh4.google.com/" />
-		<test url="http://lh5.google.com.au/" />
-		<test url="http://m.google.ca/" />
-		<test url="http://m.google.com/" />
-		<test url="http://m.google.com.au/" />
-		<test url="http://picasaweb.google.ca/" />
-		<test url="http://picasaweb.google.com/" />
-		<test url="http://picasaweb.google.com.au/" />
-
 	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
 		to="https://www.google.com/news" />
 		<test url="http://news.google.ca/" />

From 7e7680dbe5e1bf0ae0c06f3aa87270167f6f1716 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 23 Feb 2015 12:58:53 +1100
Subject: [PATCH 60/77] Removed redundant targets, moved securecookie tag into
 correct ruleset

---
 .../content/rules/Google.tld_Subdomains.xml   | 10 ++
 src/chrome/content/rules/GoogleServices.xml   | 27 +++++-
 .../content/rules/GoogleServices_Complex.xml  | 91 +------------------
 3 files changed, 38 insertions(+), 90 deletions(-)

diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index 9199786387b7..1daf3473a127 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -14,6 +14,16 @@
 	<target host="picasaweb.google.*" />
 	<target host="scholar.google.*" />
 
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
+	<!--
+		Can we secure any of these wildcard cookies safely?
+									-->
+	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
+	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
+	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
+
 	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
 			to="https://$1.google.$2/" />
 		<test url="http://accounts.google.ca/" />
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index 5330a43727c9..ed291fe864fd 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -2,7 +2,32 @@
 	Rules that are simple to write go in here, for everything else
 	See GoogleServices.xml
 
-	For other Google coverage, see GoogleServices.xml
+	Other Google rulesets:
+		- 2mdn.net.xml
+		- Admeld.xml
+		- Android.xml
+		- ChannelIntelligence.com.xml
+		- Chrome_Status.com.xml
+		- Chromium.org.xml
+		- Doubleclick.net.xml
+		- FeedBurner.xml
+		- Go_Lang.org.xml
+		- Google.com_Subdomains.xml
+		- Google.com_Subdomains_Complex.html
+		- Google.org.xml
+		- GoogleAPIs.xml
+		- Google_App_Engine.xml
+		- GoogleImages.xml
+		- GoogleServices_Simple.xml (Simple rules that normally would reside here are in this ruleset)
+		- GoogleShopping.xml
+		- Ingress.xml
+		- Made_with_Code.com.xml
+		- Meebo.xml
+		- Orkut.xml
+		- Polymer-Project.org.xml
+		- Postini.xml
+		- WebM_Project.org.xml
+		- With_Google.com.xml
 -->
 <ruleset name="Google Services Simple">
 	<target host="partner.googleadservices.com" />
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
index 172b59465ee3..8e6f03d6ed7f 100644
--- a/src/chrome/content/rules/GoogleServices_Complex.xml
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -1,31 +1,5 @@
 <!--
-	Other Google rulesets:
-
-		- 2mdn.net.xml
-		- Admeld.xml
-		- Android.xml
-		- ChannelIntelligence.com.xml
-		- Chrome_Status.com.xml
-		- Chromium.org.xml
-		- Doubleclick.net.xml
-		- FeedBurner.xml
-		- Go_Lang.org.xml
-		- Google.com_Subdomains.xml
-		- Google.com_Subdomains_Complex.html
-		- Google.org.xml
-		- GoogleAPIs.xml
-		- Google_App_Engine.xml
-		- GoogleImages.xml
-		- GoogleServices_Simple.xml (Simple rules that normally would reside here are in this ruleset)
-		- GoogleShopping.xml
-		- Ingress.xml
-		- Made_with_Code.com.xml
-		- Meebo.xml
-		- Orkut.xml
-		- Polymer-Project.org.xml
-		- Postini.xml
-		- WebM_Project.org.xml
-		- With_Google.com.xml
+	For other Google coverage, see GoogleServices.xml
 
 	Problematic domains:
 
@@ -42,42 +16,11 @@
 	* 404, valid cert
 	** Redirects to http, valid cert
 	*** Breaks followers widget - https://trac.torproject.org/projects/tor/ticket/7294
-
-
-	Partially covered domains:
-
-		- google.cctld subdomains:
-
-			- scholar	(→ www)
-
-		- *.googleusercontent.com	(*-opensocial excluded)
-
-
-	Fully covered domains:
-
-		- lh[3-6].ggpht.com
-		- (www.)goo.gl		(www → ^)
-
-		- partner.googleadservices.com
-		- (www.)googlecode.com
-		- *.googlecode.com	(per-project subdomains)
-		- googlesource.com
-		- *.googlesource.com
-		- pagead2.googlesyndication.com
-		- tpc.googlesyndication.com
-		- mail-attachment.googleusercontent.com
-		- webcache.googleusercontent.com
 -->
 <ruleset name="Google Services">
 	<target host="*.ggpht.com" />
 	<target host="goo.gl" />
 	<target host="www.goo.gl" />
-	<target host="accounts.google.*" />
-	<target host="adwords.google.*" />
-	<target host="finance.google.*" />
-	<target host="groups.google.*" />
-	<target host="it.google.*" />
-	<target host="news.google.*" />
 		<exclusion pattern="^http://(news\.)?google\.((?:com?\.)?\w{2,3})/(archivesearch|newspapers)" />
 			<test url="http://news.google.ca/archivesearch" />
 			<test url="http://news.google.com/archivesearch" />
@@ -85,18 +28,6 @@
 			<test url="http://news.google.ca/newspapers" />
 			<test url="http://news.google.com/newspapers" />
 			<test url="http://news.google.com.au/newspapers" />
-	<target host="picasaweb.google.*" />
-	<target host="scholar.google.*" />
-	<target host="*.google.ca" />
-	<target host="accounts.google.co.*" />
-	<target host="adwords.google.co.*" />
-	<target host="finance.google.co.*" />
-	<target host="groups.google.co.*" />
-	<target host="id.google.co.*" />
-	<target host="news.google.co.*" />
-	<target host="picasaweb.google.co.*" />
-	<target host="scholar.google.co.*" />
-	<target host="*.google.com" />
 		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
 			<test url="http://cbks0.google.com/" />
 			<test url="http://cbks0.google.com/?" />
@@ -106,20 +37,13 @@
 			<test url="http://gg.google.com/foo" />
 			<test url="http://gg.google.com/foo?" />
 			<test url="http://gg.google.com/foo?bar" />
-	<target host="accounts.google.com.*" />
-	<target host="adwords.google.com.*" />
-	<target host="groups.google.com.*" />
-	<target host="id.google.com.*" />
-	<target host="news.google.com.*" />
-	<target host="picasaweb.google.com.*" />
-	<target host="scholar.google.com.*" />
 	<target host="googlecode.com" />
 	<target host="*.googlecode.com" />
 	<target host="googlesource.com" />
 	<target host="*.googlesource.com" />
 	<target host="*.googlesyndication.com" />
 	<target host="*.googleusercontent.com" />
-	<target host="*.corp.googleusercontent.com" />
+		<target host="*.corp.googleusercontent.com" />
 		<!--
 			Necessary for the Followers widget:
 
@@ -130,17 +54,6 @@
 			<test url="http://bar-opensocial.googleusercontent.com" />
 			<test url="http://foobar-opensocial.googleusercontent.com" />
 
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
-	<!--
-		Can we secure any of these wildcard cookies safely?
-									-->
-	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
-	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
-	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
-	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
 	<securecookie host="^mail-attachment\.googleusercontent\.com$" name=".+" />
 
 	<!--    - lh 3-6 exist

From 3a63ad4b178702637d85e280d2f128aafe0f1798 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 23 Feb 2015 13:09:11 +1100
Subject: [PATCH 61/77] news.google.com now supports HTTPS basically all over

---
 .../content/rules/Google.tld_Subdomains.xml   | 13 ++++++++++++-
 .../content/rules/GoogleServices_Complex.xml  | 19 -------------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index 1daf3473a127..3aa20087720b 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -11,6 +11,7 @@
 	<target host="id.google.*" />
 	<target host="lh\d.google.*" />
 	<target host="m.google.*" />
+	<target host="news.google.*" />
 	<target host="picasaweb.google.*" />
 	<target host="scholar.google.*" />
 
@@ -24,7 +25,14 @@
 	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
 	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
 
-	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
+	<!-- path that 404 on https but 301 on http -->
+	<rule from="^http://news\.?google\.((?:com?\.)?\w{2,3})/archivesearch"
+			to="https://news.google.$1/news/advanced_news_search" />
+		<test url="http://news.google.ca/archivesearch" />
+		<test url="http://news.google.com/archivesearch" />
+		<test url="http://news.google.com.au/archivesearch" />
+
+	<rule from="^http://(accounts|adwords|finance|groups|id|lh\d|m|news|picasaweb|scholar)\.google\.((?:com?\.)?\w{2,3})/"
 			to="https://$1.google.$2/" />
 		<test url="http://accounts.google.ca/" />
 		<test url="http://accounts.google.com/" />
@@ -47,6 +55,9 @@
 		<test url="http://m.google.ca/" />
 		<test url="http://m.google.com/" />
 		<test url="http://m.google.com.au/" />
+		<test url="http://news.google.ca/" />
+		<test url="http://news.google.com/" />
+		<test url="http://news.google.com.au/" />
 		<test url="http://picasaweb.google.ca/" />
 		<test url="http://picasaweb.google.com/" />
 		<test url="http://picasaweb.google.com.au/" />
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
index 8e6f03d6ed7f..64d31930fde0 100644
--- a/src/chrome/content/rules/GoogleServices_Complex.xml
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -21,13 +21,6 @@
 	<target host="*.ggpht.com" />
 	<target host="goo.gl" />
 	<target host="www.goo.gl" />
-		<exclusion pattern="^http://(news\.)?google\.((?:com?\.)?\w{2,3})/(archivesearch|newspapers)" />
-			<test url="http://news.google.ca/archivesearch" />
-			<test url="http://news.google.com/archivesearch" />
-			<test url="http://news.google.com.au/archivesearch" />
-			<test url="http://news.google.ca/newspapers" />
-			<test url="http://news.google.com/newspapers" />
-			<test url="http://news.google.com.au/newspapers" />
 		<exclusion pattern="^http://cbks0\.google\.com/(?:$|\?)" />
 			<test url="http://cbks0.google.com/" />
 			<test url="http://cbks0.google.com/?" />
@@ -72,18 +65,6 @@
 		<test url="http://www.goo.gl/" />
 		<test url="http://goo.gl/" />
 
-	<rule from="^http://news\.google\.(?:com?\.)?\w{2,3}/(?:$|news|newshp)"
-		to="https://www.google.com/news" />
-		<test url="http://news.google.ca/" />
-		<test url="http://news.google.ca/news" />
-		<test url="http://news.google.ca/newshp" />
-		<test url="http://news.google.com/" />
-		<test url="http://news.google.com/news" />
-		<test url="http://news.google.com/newshp" />
-		<test url="http://news.google.com.au/" />
-		<test url="http://news.google.com.au/news" />
-		<test url="http://news.google.com.au/newshp" />
-
 	<!-- wildcards -->
 
 	<rule from="^http://([^@:\./]+)\.googleusercontent\.com/"

From a9eb5f2790cc495325996d58c03c633f970ee752 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 23 Feb 2015 13:11:43 +1100
Subject: [PATCH 62/77] Fixed up securecookie tags

---
 .../content/rules/Google.com_Subdomains.xml   |  2 ++
 .../content/rules/Google.tld_Subdomains.xml   | 21 ++-----------------
 src/chrome/content/rules/Google.xml           |  8 +++++++
 src/chrome/content/rules/GoogleServices.xml   |  2 +-
 .../content/rules/GoogleServices_Complex.xml  |  9 --------
 5 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 3ef2f61d7009..aac446a798db 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -116,6 +116,8 @@
 	<target host="tools.google.com" />
 	<target host="wallet.google.com" />
 
+	<securecookie host="^(?:\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
+
 	<!-- *.corp wildcard -->
 	<rule from="^http://([\w-]+)\.corp\.google\.com/"
 			to="https://$1.corp.google.com/" />
diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index 3aa20087720b..602f764018f5 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -4,26 +4,9 @@
 	This ruleset is subdomains that exist on google.tld (not just google.com)
 -->
 <ruleset name="Google.tld Subdomains">
-	<target host="accounts.google.*" />
-	<target host="adwords.google.*" />
-	<target host="finance.google.*" />
-	<target host="groups.google.*" />
-	<target host="id.google.*" />
-	<target host="lh\d.google.*" />
-	<target host="m.google.*" />
-	<target host="news.google.*" />
-	<target host="picasaweb.google.*" />
-	<target host="scholar.google.*" />
+	<target host="*.google.*" />
 
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
-	<!--
-		Can we secure any of these wildcard cookies safely?
-									-->
-	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
-	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
-	<securecookie host="^(?:accounts|adwords|\.code|login\.corp|developers|docs|\d\.docs|fiber|mail|picasaweb|plus|\.?productforums|support)\.google\.[\w.]{2,6}$" name=".+" />
+	<securecookie host="^(?:accounts|adwords|m|picasaweb)\.google\.[\w.]{2,6}$" name=".+" />
 
 	<!-- path that 404 on https but 301 on http -->
 	<rule from="^http://news\.?google\.((?:com?\.)?\w{2,3})/archivesearch"
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index abea84d93731..9a5ffe215dfb 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -21,6 +21,14 @@
 		<test url="http://google.com/imgres/" />
 
 	<securecookie host="^www\.google\.com$" name="^GoogleAccountsLocale_session$" />
+	<!--	Not secured by server:
+					-->
+	<!--securecookie host="^\.google\.com$" name="^(APISID|HSID|NID|PREF|SID)$" /-->
+	<!--
+		Can we secure any of these wildcard cookies safely?
+									-->
+	<!--securecookie host="^\.google\.com$" name="^(hl|I4SUserLocale|NID|PREF|S)$" /-->
+	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
 
 	<!-- Problems -->
 		<!--
diff --git a/src/chrome/content/rules/GoogleServices.xml b/src/chrome/content/rules/GoogleServices.xml
index ed291fe864fd..670a6b4320e7 100644
--- a/src/chrome/content/rules/GoogleServices.xml
+++ b/src/chrome/content/rules/GoogleServices.xml
@@ -18,7 +18,7 @@
 		- GoogleAPIs.xml
 		- Google_App_Engine.xml
 		- GoogleImages.xml
-		- GoogleServices_Simple.xml (Simple rules that normally would reside here are in this ruleset)
+		- GoogleServices_Complex.xml (Simple rules that normally would reside here are in this ruleset)
 		- GoogleShopping.xml
 		- Ingress.xml
 		- Made_with_Code.com.xml
diff --git a/src/chrome/content/rules/GoogleServices_Complex.xml b/src/chrome/content/rules/GoogleServices_Complex.xml
index 64d31930fde0..936674b77bff 100644
--- a/src/chrome/content/rules/GoogleServices_Complex.xml
+++ b/src/chrome/content/rules/GoogleServices_Complex.xml
@@ -4,17 +4,8 @@
 	Problematic domains:
 
 		- www.goo.gl		(404; mismatched, CN: *.google.com)
-
-		- www.news.google.ca ²
-
-		- news.google.cctld **
-		- scholar.google.cctld **
 		- *-opensocial.googleusercontent.com ***
 
-	² Mismatched, CN: google.com
-	**** $ 404s
-	* 404, valid cert
-	** Redirects to http, valid cert
 	*** Breaks followers widget - https://trac.torproject.org/projects/tor/ticket/7294
 -->
 <ruleset name="Google Services">

From 981f7efba472adbed9b9bcd42865857566a0a82e Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 28 Feb 2015 16:58:01 +1100
Subject: [PATCH 63/77] Checked list of hosts, updated comments on which work
 and how.

---
 src/chrome/content/rules/GoogleImages.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/rules/GoogleImages.xml b/src/chrome/content/rules/GoogleImages.xml
index 0112001e0440..8faf53db9e48 100644
--- a/src/chrome/content/rules/GoogleImages.xml
+++ b/src/chrome/content/rules/GoogleImages.xml
@@ -7,18 +7,18 @@
 		- www.google.bo *
 		- www.google.co *
 		- www.google.ec *
-		- www.google.in *
+		- www.google.in **
 		- www.google.kr *
-		- www.google.com.kz **
+		- www.google.com.kz *
 		- www.google.com.lk *
-		- www.google.mx **
+		- www.google.mx *
 		- www.google.sg *
 		- www.google.sl *
 		- www.google.ug *
 		- www.google.vn *
 
-	* 404; mismatched, CN: google.com
-	** Works; mismatched, CN: google.com
+	* mismatched, CN: google.com
+	** 404
 
 -->
 <ruleset name="Google Images">

From 2dbaf887b5d245d5926c9b6ced0644af0909897b Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 28 Feb 2015 17:13:45 +1100
Subject: [PATCH 64/77] Moving broken tlds into Google.xml and cleaning up
 GoogleImages.xml

---
 .../content/rules/Google.tld_Subdomains.xml   |  2 +
 src/chrome/content/rules/Google.xml           | 30 +++++++
 src/chrome/content/rules/GoogleImages.xml     | 78 +++++--------------
 3 files changed, 52 insertions(+), 58 deletions(-)

diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index 602f764018f5..ea3d6d7ab812 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -2,6 +2,8 @@
 	For other Google coverage, see GoogleServices.xml
 
 	This ruleset is subdomains that exist on google.tld (not just google.com)
+
+	*** images.google.tld is covered in GoogleImages.xml ***
 -->
 <ruleset name="Google.tld Subdomains">
 	<target host="*.google.*" />
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 9a5ffe215dfb..02e849e5a5eb 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -2,6 +2,8 @@
 	This ruleset only covers (www.)?google.tld
 	For other Google coverage, see GoogleServices.xml
 
+	*** Google Images related paths are covered in GoogleImages.xml ***
+
 	Nonfunctional google.com paths:
 
 		- analytics	*
@@ -31,6 +33,34 @@
 	<!--securecookie host="^\.google\.[\w.]{2,6}$" name="^(hl|I4SUserLocale|NID|PREF|S|S_awfe)$" /-->
 
 	<!-- Problems -->
+	<!--	First handle problematic tlds:
+				- www.google.bo *
+				- www.google.co *
+				- www.google.ec *
+				- www.google.in **
+				- www.google.kr *
+				- www.google.com.kz *
+				- www.google.com.lk *
+				- www.google.mx *
+				- www.google.sg *
+				- www.google.sl *
+				- www.google.ug *
+				- www.google.vn *
+
+			* mismatched, CN: google.com
+			** 404
+	-->
+	<rule from="^http://(?:www\.)?google\.co/"
+		to="https://www.google.com/" />
+
+	<rule from="^http://(?:www\.)?google\.(?:co\.)?(in|kr|ug)/"
+		to="https://www.google.co.$1/" />
+
+	<rule from="^http://(?:www\.)?google\.(?:com\.)?(kz|lk)/"
+		to="https://www.google.$1/" />
+
+	<rule from="^http://(?:www\.)?google\.(?:com\.)?(bo|ec|mx|sg|sl|vn)/"
+		to="https://www.google.com.$1/" />
 		<!--
 			https://www.google.com.au/tisp/	200 (OK)
 			https://www.google.com.au/tisp	404
diff --git a/src/chrome/content/rules/GoogleImages.xml b/src/chrome/content/rules/GoogleImages.xml
index 8faf53db9e48..5c37ba6d57a8 100644
--- a/src/chrome/content/rules/GoogleImages.xml
+++ b/src/chrome/content/rules/GoogleImages.xml
@@ -1,65 +1,27 @@
 <!--
 	For other Google coverage, see GoogleServices.xml.
-
-
-	Problematic domains:
-
-		- www.google.bo *
-		- www.google.co *
-		- www.google.ec *
-		- www.google.in **
-		- www.google.kr *
-		- www.google.com.kz *
-		- www.google.com.lk *
-		- www.google.mx *
-		- www.google.sg *
-		- www.google.sl *
-		- www.google.ug *
-		- www.google.vn *
-
-	* mismatched, CN: google.com
-	** 404
-
 -->
 <ruleset name="Google Images">
-
 	<target host="google.*" />
 	<target host="www.google.*" />
-	<target host="google.co.*" />
-	<target host="www.google.co.*" />
-	<target host="google.com" />
-	<target host="images.google.com" />
-	<target host="google.com.*" />
-	<target host="www.google.com.*" />
-		<!--
-			Only handle image-related paths in this ruleset:
-										-->
-		<exclusion pattern="^http://(?:www\.)?google(?:\.com?)?\.\w{2,3}/(?!(?:advanced_image_search|imghp|.*tb(?:m=isch|s=sbi)))" />
-
-
-	<rule from="^http://(?:www\.)?google\.com/"
-		to="https://www.google.com/" />
-
-	<rule from="^http://images\.google\.com/"
-		to="https://images.google.com/" />
-
-	<!--	First handle problematic domains:
-							-->
-	<rule from="^http://(?:www\.)?google\.co/"
-		to="https://www.google.com/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:co\.)?(in|kr|ug)/"
-		to="https://www.google.co.$1/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:com\.)?(kz|lk)/"
-		to="https://www.google.$1/" />
-
-	<rule from="^http://(?:www\.)?google\.(?:com\.)?(bo|ec|mx|sg|sl|vn)/"
-		to="https://www.google.com.$1/" />
-
-	<!--	And then the rest:
-					-->
-	<rule from="^http://(?:www\.)?google\.(com?\.)?(ae|ar|at|au|bg|bh|br|ca|ch|cl|co|cr|cu|de|eg|es|fi|fr|gh|gt|hr|id|ie|il|it|jo|jp|jm|ke|kw|lb|ly|my|na|ng|nl|no|nz|om|pa|pe|pk|pl|pt|py|qa|ro|ru|rw|sa|se|sv|th|tr|uk|uy|ve|za|zw)/"
-		to="https://www.google.$1$2/" />
-
+	<target host="images.google.*" />
+
+	<rule from="^http://images\.google\.((?:com?\.)?\w{2,3})/"
+			to="https://images.google.$1/" />
+		<test url="http://images.google.ca/" />
+		<test url="http://images.google.com/" />
+		<test url="http://images.google.com.au/" />
+
+	<!--
+		Only handle image-related paths in this ruleset:
+	-->
+	<rule from="^http://(www\.)?google\.((?:com?\.)?\w{2,3})/(advanced_image_search|imghp|.*tb(?:m=isch|s=sbi))"
+			to="https://www.google.$2/$3" />
+		<test url="http://www.google.ca/advanced_image_search" />
+		<test url="http://www.google.com/advanced_image_search" />
+		<test url="http://www.google.com.au/advanced_image_search" />
+		<test url="http://www.google.ca/imghp" />
+		<test url="http://www.google.com/imghp" />
+		<test url="http://www.google.com.au/imghp" />
+		<!-- need working urls for .*tb(?:m=isch|s=sbi) -->
 </ruleset>

From c5849264cf37d831b21eefd99c2534a665a01795 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sat, 28 Feb 2015 17:28:24 +1100
Subject: [PATCH 65/77] expanded target to pass build

---
 .../content/rules/Google.tld_Subdomains.xml    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index ea3d6d7ab812..59b10c06cd98 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -6,7 +6,23 @@
 	*** images.google.tld is covered in GoogleImages.xml ***
 -->
 <ruleset name="Google.tld Subdomains">
-	<target host="*.google.*" />
+	<!--
+		failure: *.google.* failed: The target host must be a hostname, not URL, and must use at most one wildcard.
+	-->
+	<target host="accounts.google.*" />
+	<target host="adwords.google.*" />
+	<target host="finance.google.*" />
+	<target host="groups.google.*" />
+	<target host="id.google.*" />
+	<target host="lh2.google.*" />
+	<target host="lh3.google.*" />
+	<target host="lh4.google.*" />
+	<target host="lh5.google.*" />
+	<target host="lh6.google.*" />
+	<target host="m.google.*" />
+	<target host="news.google.*" />
+	<target host="picasaweb.google.*" />
+	<target host="scholar.google.*" />
 
 	<securecookie host="^(?:accounts|adwords|m|picasaweb)\.google\.[\w.]{2,6}$" name=".+" />
 

From 335cd9a1e4de5f16a6d1af09173ea154611cedda Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 15:45:52 +1100
Subject: [PATCH 66/77] [Google.tld Subdomains] Fixed type in from url

---
 src/chrome/content/rules/Google.tld_Subdomains.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Google.tld_Subdomains.xml b/src/chrome/content/rules/Google.tld_Subdomains.xml
index 59b10c06cd98..8f4e4b8d8e3a 100644
--- a/src/chrome/content/rules/Google.tld_Subdomains.xml
+++ b/src/chrome/content/rules/Google.tld_Subdomains.xml
@@ -27,7 +27,7 @@
 	<securecookie host="^(?:accounts|adwords|m|picasaweb)\.google\.[\w.]{2,6}$" name=".+" />
 
 	<!-- path that 404 on https but 301 on http -->
-	<rule from="^http://news\.?google\.((?:com?\.)?\w{2,3})/archivesearch"
+	<rule from="^http://news\.google\.((?:com?\.)?\w{2,3})/archivesearch"
 			to="https://news.google.$1/news/advanced_news_search" />
 		<test url="http://news.google.ca/archivesearch" />
 		<test url="http://news.google.com/archivesearch" />

From 4b4bcb342407bd251def953d36be4f51a1617c6f Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 15:46:05 +1100
Subject: [PATCH 67/77] [Google] Added more test urls

---
 src/chrome/content/rules/Google.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 02e849e5a5eb..497ea92433d8 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -52,15 +52,40 @@
 	-->
 	<rule from="^http://(?:www\.)?google\.co/"
 		to="https://www.google.com/" />
+		<test url="http://google.co/" />
+		<test url="http://www.google.co/" />
 
 	<rule from="^http://(?:www\.)?google\.(?:co\.)?(in|kr|ug)/"
 		to="https://www.google.co.$1/" />
+		<test url="http://google.co.in/" />
+		<test url="http://www.google.co.in/" />
+		<test url="http://google.co.kr/" />
+		<test url="http://www.google.co.kr/" />
+		<test url="http://google.co.ug/" />
+		<test url="http://www.google.co.ug/" />
 
 	<rule from="^http://(?:www\.)?google\.(?:com\.)?(kz|lk)/"
 		to="https://www.google.$1/" />
+		<test url="http://google.com.kz/" />
+		<test url="http://www.google.com.kz/" />
+		<test url="http://google.com.lk/" />
+		<test url="http://www.google.com.lk/" />
 
 	<rule from="^http://(?:www\.)?google\.(?:com\.)?(bo|ec|mx|sg|sl|vn)/"
 		to="https://www.google.com.$1/" />
+		<test url="http://google.com.bo/" />
+		<test url="http://www.google.com.bo/" />
+		<test url="http://google.com.ec/" />
+		<test url="http://www.google.com.ec/" />
+		<test url="http://google.com.mx/" />
+		<test url="http://www.google.com.mx/" />
+		<test url="http://google.com.sg/" />
+		<test url="http://www.google.com.sg/" />
+		<test url="http://google.com.sl/" />
+		<test url="http://www.google.com.sl/" />
+		<test url="http://google.com.vn/" />
+		<test url="http://www.google.com.vn/" />
+		
 		<!--
 			https://www.google.com.au/tisp/	200 (OK)
 			https://www.google.com.au/tisp	404

From 0aa30d5a570ed23008d343def1e996c744ffc6a0 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 15:46:26 +1100
Subject: [PATCH 68/77] [Google APIs] Added tests

---
 src/chrome/content/rules/GoogleAPIs.xml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/GoogleAPIs.xml b/src/chrome/content/rules/GoogleAPIs.xml
index bd8d203dc54e..a4fa4ac7eaee 100644
--- a/src/chrome/content/rules/GoogleAPIs.xml
+++ b/src/chrome/content/rules/GoogleAPIs.xml
@@ -68,8 +68,19 @@
 <ruleset name="Google APIs">
 	<target host="gmodules.com" />
 	<target host="www.gmodules.com" />
-	<target host="*.google-analytics.com" />
-	<target host="*.googleapis.com" />
+		<!-- need this exclusion otherwise the test checker will use the hosts as test urls -->
+		<exclusion pattern="^http://(www\.)?gmodules\.com/$" />
+
+	<target host="www.google-analytics.com" />
+	<target host="ssl.google-analytics.com" />
+
+	<target host="ajax.googleapis.com" />
+	<target host="chart.googleapis.com" />
+	<target host="fonts.googleapis.com" />
+	<target host="www.googleapis.com" />
+	<target host="*.commondatastorage.googleapis.com" />
+	<target host="*.storage.googleapis.com" />
+
 	<target host="gstatic.com" />
 	<target host="*.gstatic.com" />
 	<target host="api.recaptcha.net" />
@@ -81,7 +92,7 @@
 		See GitHub bug #368
 			-->
 	<exclusion pattern="^http://www\.gstatic\.com/generate_204" />
-		<test url="htttp://www.gstatic.com/generate_204" />
+		<test url="http://www.gstatic.com/generate_204" />
 
 	<exclusion pattern="^http://gdata\.youtube\.com/crossdomain\.xml" />
 		<test url="http://gdata.youtube.com/crossdomain.xml" />
@@ -90,6 +101,8 @@
 
 	<rule from="^http://(?:www\.)?gmodules\.com/ig/images/"
 		to="https://www.google.com/ig/images/" />
+		<test url="http://gmodules.com/ig/images/" />
+		<test url="http://www.gmodules.com/ig/images/" />
 
 	<rule from="^http://(ssl|www)\.google-analytics\.com/"
 		to="https://$1.google-analytics.com/" />
@@ -99,6 +112,10 @@
 
 	<rule from="^http://([^@:\./]+\.)?(commondata)?storage\.googleapis\.com/"
 		to="https://$1$2storage.googleapis.com/" />
+		<test url="http://storage.googleapis.com/" />
+		<test url="http://commondatastorage.googleapis.com/" />
+		<test url="http://chromedriver.storage.googleapis.com/" />
+		<test url="http://patentimages.storage.googleapis.com/" />
 
 	<!--	There is an interesting question about whether we should
 		append &strip=1 to all cache URLs.  This causes them to load

From eca17969d042a15d4f72fde32503810ed50e03c5 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 15:46:48 +1100
Subject: [PATCH 69/77] [Google Images] Added tests for remaining rules

---
 src/chrome/content/rules/GoogleImages.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/GoogleImages.xml b/src/chrome/content/rules/GoogleImages.xml
index 5c37ba6d57a8..079e2426184d 100644
--- a/src/chrome/content/rules/GoogleImages.xml
+++ b/src/chrome/content/rules/GoogleImages.xml
@@ -23,5 +23,10 @@
 		<test url="http://www.google.ca/imghp" />
 		<test url="http://www.google.com/imghp" />
 		<test url="http://www.google.com.au/imghp" />
-		<!-- need working urls for .*tb(?:m=isch|s=sbi) -->
+		<test url="http://www.google.ca/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
+		<test url="http://www.google.com/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
+		<test url="http://www.google.com.au/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
+		<test url="http://www.google.ca/search?q=test&amp;tbs=sbi" />
+		<test url="http://www.google.com/search?q=test&amp;tbs=sbi" />
+		<test url="http://www.google.com.au/search?q=test&amp;tbs=sbi" />
 </ruleset>

From 258c2a1a6789bef7e28f060e19fb4124228439fd Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 15:57:28 +1100
Subject: [PATCH 70/77] [Google] expanded tests to cover non-www

---
 src/chrome/content/rules/Google.xml | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index 497ea92433d8..bbffc43d01f6 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -85,7 +85,7 @@
 		<test url="http://www.google.com.sl/" />
 		<test url="http://google.com.vn/" />
 		<test url="http://www.google.com.vn/" />
-		
+
 		<!--
 			https://www.google.com.au/tisp/	200 (OK)
 			https://www.google.com.au/tisp	404
@@ -346,6 +346,27 @@
 	<!--   Paths that only exist/work on .com   -->
 	<rule from="^http://(www\.)?google\.com/(\+|afsonline|appsstatus|buzz|chat|chart|chromeos|codesearch|extern_js|glass|googlebooks|ig|insights|jsapi|moderator|phone|recaptcha|safebrowsing|uds|videotargetting|webfonts)"
 		to="https://www.google.com/$2" />
+		<test url="http://google.com/+" />
+		<test url="http://google.com/afsonline" />
+		<test url="http://google.com/appsstatus" />
+		<test url="http://google.com/buzz" />
+		<test url="http://google.com/chat" />
+		<test url="http://google.com/chart" />
+		<test url="http://google.com/chromeos" />
+		<test url="http://google.com/codesearch" />
+		<test url="http://google.com/extern_js" />
+		<test url="http://google.com/glass" />
+		<test url="http://google.com/googlebooks" />
+		<test url="http://google.com/ig" />
+		<test url="http://google.com/insights" />
+		<test url="http://google.com/jsapi" />
+		<test url="http://google.com/moderator" />
+		<test url="http://google.com/phone" />
+		<test url="http://google.com/recaptcha" />
+		<test url="http://google.com/safebrowsing" />
+		<test url="http://google.com/uds" />
+		<test url="http://google.com/videotargetting" />
+		<test url="http://google.com/webfonts" />
 		<test url="http://www.google.com/+" />
 		<test url="http://www.google.com/afsonline" />
 		<test url="http://www.google.com/appsstatus" />

From cd268294175648efb5aabcdc5f70297fee06f814 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 15:58:00 +1100
Subject: [PATCH 71/77] [Google.com Subdomains (Complex)] Fixed typo in test
 url

---
 src/chrome/content/rules/Google.com_Subdomains_Complex.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
index 4ab125e37411..d1f2e00b0e5f 100644
--- a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -58,7 +58,7 @@
 
 	<rule from="^http://chart\.apis\.google\.com/chart"
 	to="https://chart.googleapis.com/chart" />
-		<test url="http://chat.apis.google.com/chart" />
+		<test url="http://chart.apis.google.com/chart" />
 
 	<rule from="^http://([\w-]+)\.clients\.google\.com/"
 		to="https://$1.clients.google.com/" />

From b43766274c2acd0a075f2f791c9236ea8103ccb7 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Sun, 1 Mar 2015 16:00:05 +1100
Subject: [PATCH 72/77] [Google.com Subdomains (Complex)] Fixed test urls
 incorrectly written as https

---
 src/chrome/content/rules/Google.com_Subdomains_Complex.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
index d1f2e00b0e5f..3b1805cdf60f 100644
--- a/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains_Complex.xml
@@ -62,9 +62,9 @@
 
 	<rule from="^http://([\w-]+)\.clients\.google\.com/"
 		to="https://$1.clients.google.com/" />
-		<test url="https://foo.clients.google.com/bar" />
-		<test url="https://bar.clients.google.com/" />
-		<test url="https://foobar.clients.google.com/foobar" />
+		<test url="http://foo.clients.google.com/bar" />
+		<test url="http://bar.clients.google.com/" />
+		<test url="http://foobar.clients.google.com/foobar" />
 
 	<rule from="^http://codesearch\.google\.com/"
 		to="https://www.google.com/codesearch/" />

From b43fc600d64789b4eadc3e8c815f31850954fe01 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 2 Mar 2015 09:38:28 +1100
Subject: [PATCH 73/77] [Google Images] Clarified tbs=sbi

---
 src/chrome/content/rules/GoogleImages.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/GoogleImages.xml b/src/chrome/content/rules/GoogleImages.xml
index 079e2426184d..d0945997e541 100644
--- a/src/chrome/content/rules/GoogleImages.xml
+++ b/src/chrome/content/rules/GoogleImages.xml
@@ -26,7 +26,8 @@
 		<test url="http://www.google.ca/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
 		<test url="http://www.google.com/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
 		<test url="http://www.google.com.au/search?q=test&amp;biw=1440&amp;bih=725&amp;source=lnms&amp;tbm=isch" />
-		<test url="http://www.google.ca/search?q=test&amp;tbs=sbi" />
-		<test url="http://www.google.com/search?q=test&amp;tbs=sbi" />
-		<test url="http://www.google.com.au/search?q=test&amp;tbs=sbi" />
+		<!-- tbs=sbi afaik is the "Google Sorry" page, but I can't find a Google Images related URL for it -->
+		<test url="http://www.google.ca/search?tbs=sbi" />
+		<test url="http://www.google.com/search?tbs=sbi" />
+		<test url="http://www.google.com.au/search?tbs=sbi" />
 </ruleset>

From 939ac95ec311f78a999f02bb7340efa4a3fc397f Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 2 Mar 2015 09:40:41 +1100
Subject: [PATCH 74/77] [Google Sorry] renamed, expanded coverage to whole of
 sorry.google.com

---
 .../content/rules/Google.com_Subdomains.xml    |  2 ++
 src/chrome/content/rules/Google.xml            |  4 ++++
 src/chrome/content/rules/GoogleSorry.xml       | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index aac446a798db..48b6bb1fd6ce 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -91,6 +91,7 @@
 	<target host="knoll.google.com" />
 	<target host="mail.google.com" />
 		<target host="chatenabled.mail.google.com" />
+	<!-- See GoogleMaps.xml for maps -->
 	<target host="pack.google.com" />
 	<target host="pki.google.com" />
 	<target host="play.google.com" />
@@ -108,6 +109,7 @@
 	<target host="servicessites.google.com" />
 	<target host="sites.google.com" />
 	<target host="slides.google.com" />
+	<!-- see GoogleSorry.xml for sorry -->
 	<target host="spreadsheets.google.com" />
 	<target host="suggestqueries.google.com" />
 	<target host="support.google.com" />
diff --git a/src/chrome/content/rules/Google.xml b/src/chrome/content/rules/Google.xml
index bbffc43d01f6..4919b50cfbda 100644
--- a/src/chrome/content/rules/Google.xml
+++ b/src/chrome/content/rules/Google.xml
@@ -346,6 +346,10 @@
 	<!--   Paths that only exist/work on .com   -->
 	<rule from="^http://(www\.)?google\.com/(\+|afsonline|appsstatus|buzz|chat|chart|chromeos|codesearch|extern_js|glass|googlebooks|ig|insights|jsapi|moderator|phone|recaptcha|safebrowsing|uds|videotargetting|webfonts)"
 		to="https://www.google.com/$2" />
+
+		<!--
+			/sorry/ is covered under GoogleSorry.xml
+			-->
 		<test url="http://google.com/+" />
 		<test url="http://google.com/afsonline" />
 		<test url="http://google.com/appsstatus" />
diff --git a/src/chrome/content/rules/GoogleSorry.xml b/src/chrome/content/rules/GoogleSorry.xml
index eae11e08266a..1a396f437ca6 100644
--- a/src/chrome/content/rules/GoogleSorry.xml
+++ b/src/chrome/content/rules/GoogleSorry.xml
@@ -1,7 +1,15 @@
-<ruleset name="GoogleSorry">
-  <target host="sorry.google.com" />
-  <target host="www.google.com" />
-  <target host="google.com" />
+<ruleset name="Google Sorry">
+	<target host="sorry.google.com" />
+	<target host="www.google.com" />
+	<target host="google.com" />
+		<!-- need this due to test-ruleset-coverage.sh -->
+		<exclusion pattern="^http://(www\.)?google.com/$" />
 
-  <rule from="^http://(?:sorry\.|www\.)?google\.com/sorry/" to="https://sorry.google.com/sorry/" />
+	<rule from="^http://(www\.)?google\.com/sorry/"
+			to="https://sorry.google.com/sorry/" />
+		<test url="http://google.com/sorry/" />
+		<test url="http://www.google.com/sorry/" />
+
+	<rule from="^http://sorry\.google\.com/"
+			to="https://sorry.google.com/" />
 </ruleset>

From ac859c67256ac28d6fab32734142b08dc5eb483b Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Tue, 3 Mar 2015 09:38:58 +1100
Subject: [PATCH 75/77] [Google Maps] Reenabled Google Maps

---
 src/chrome/content/rules/GoogleMaps.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/GoogleMaps.xml b/src/chrome/content/rules/GoogleMaps.xml
index 3b5d605cbfd5..044b7d86086d 100644
--- a/src/chrome/content/rules/GoogleMaps.xml
+++ b/src/chrome/content/rules/GoogleMaps.xml
@@ -1,6 +1,9 @@
 <!--
+Ignore this error if it ever happens again, it's ok. Please reenable this ruleset if it happens again.
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl.google.com/ (404)
+------
+
 	Problematic domains:
 
 		- khms *
@@ -17,7 +20,7 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 			- khms[0-3]
 
 -->
-<ruleset name="Google Maps" default_off='failed ruleset test'>
+<ruleset name="Google Maps">
 
 	<target host="maps.google.*" />
 		<!--

From 5f558d91a2e032cab01b23bff5798cd07002ddef Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Wed, 4 Mar 2015 12:32:01 +1100
Subject: [PATCH 76/77] [Google Maps] Added more test urls removed exclusions
 that no longer matter

---
 .../content/rules/Google.com_Subdomains.xml   |  3 ++
 src/chrome/content/rules/GoogleMaps.xml       | 29 ++++++++++++-------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/chrome/content/rules/Google.com_Subdomains.xml b/src/chrome/content/rules/Google.com_Subdomains.xml
index 48b6bb1fd6ce..ecc979e0d802 100644
--- a/src/chrome/content/rules/Google.com_Subdomains.xml
+++ b/src/chrome/content/rules/Google.com_Subdomains.xml
@@ -87,11 +87,14 @@
 	<target host="investor.google.com" />
 	<target host="ipv4.google.com" />
 	<target host="ipv6.google.com" />
+	<!-- See GoogleMaps.xml for khms\d? -->
 	<target host="knol.google.com" />
 	<target host="knoll.google.com" />
 	<target host="mail.google.com" />
 		<target host="chatenabled.mail.google.com" />
 	<!-- See GoogleMaps.xml for maps -->
+	<!-- See GoogleMaps.xml for maps-api-ssl -->
+	<!-- See GoogleMaps.xml for mw2 -->
 	<target host="pack.google.com" />
 	<target host="pki.google.com" />
 	<target host="play.google.com" />
diff --git a/src/chrome/content/rules/GoogleMaps.xml b/src/chrome/content/rules/GoogleMaps.xml
index 044b7d86086d..c03a9a6e6683 100644
--- a/src/chrome/content/rules/GoogleMaps.xml
+++ b/src/chrome/content/rules/GoogleMaps.xml
@@ -21,13 +21,14 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 
 -->
 <ruleset name="Google Maps">
-
 	<target host="maps.google.*" />
 		<!--
 			https://trac.torproject.org/projects/tor/ticket/8627
 										-->
 		<exclusion pattern="^http://maps\.google\.com/local_url" />
+			<test url="http://maps.google.com/local_url" />
 		<exclusion pattern="^http://maps\.google\.gr/transitathens" />
+			<test url="http://maps.google.gr/transitathens" />
 	<target host="maps.google.co.*" />
 	<target host="khms.google.com" />
 	<target host="khms0.google.com" />
@@ -40,9 +41,12 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 	<target host="maps.googleapis.com" />
 		<!--
 			https://mail1.eff.org/pipermail/https-everywhere-rules/2012-September/001317.html
-														-->
-		<!--exclusion pattern="^http://maps\.googleapis\.com/map(files/lib/map_1_20\.swf|sapi/publicapi\?file=flashapi)" /-->
-		<exclusion pattern="^http://maps\.googleapis\.com/map(?:files/lib/map_\d+_\d+\.swf|sapi/publicapi\?file=flashapi)" />
+			These now 404
+		<exclusion pattern="^http://maps\.googleapis\.com/mapfiles/lib/map_\d+_\d+\.swf" />
+			<test url="http://maps.googleapis.com/mapfiles/lib/map_1_20.swf" />
+		<exclusion pattern="^http://maps\.googleapis\.com/mapsapi/publicapi\?file=flashapi" />
+			<test url="http://maps.googleapis.com/mapsapi/publicapi?file=flashapi" />
+		-->
 	<target host="maps.gstatic.com" />
 
 
@@ -52,8 +56,11 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 	<securecookie host="^maps-api-ssl\.google\.com$" name=".+" />
 
 
-	<rule from="^http://maps\.google\.([^/]+)/"
+	<rule from="^http://maps\.google\.((?:com?\.)?\w{2,3})/"
 		to="https://maps.google.$1/" />
+		<test url="http://maps.google.ca/" />
+		<test url="http://maps.google.com/" />
+		<test url="http://maps.google.com.au/" />
 
 	<!--	http://khms.../$ 404s:
 					-->
@@ -63,10 +70,12 @@ Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl
 	<rule from="^http://(khms\d?|maps-api-ssl|mw2)\.google\.com/"
 		to="https://$1.google.com/" />
 
-	<rule from="^http://maps\.g(oogleapis|static)\.com/"
-		to="https://maps.g$1.com/" />
-
-	<rule from="^https://maps\.googleapis\.com/map(?=files/lib/map_\d+_\d+\.swf|sapi/publicapi\?file=flashapi)"
-		to="http://maps.googleapis.com/map" downgrade="1" />
+	<rule from="^http://maps\.googleapis\.com/"
+		to="https://maps.googleapis.com/" />
 
+	<rule from="^http://maps\.gstatic\.com/"
+		to="https://maps.gstatic.com/" />
+	<!-- covered in exclusion rule, there should be no need to downgrade -->
+	<!--rule from="^https://maps\.googleapis\.com/map(?=files/lib/map_\d+_\d+\.swf|sapi/publicapi\?file=flashapi)"
+		to="http://maps.googleapis.com/map" downgrade="1" /-->
 </ruleset>

From dc79ad3a49ccb80d0dd5e13255bee60c9c58af01 Mon Sep 17 00:00:00 2001
From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Mon, 9 Mar 2015 12:16:27 +1100
Subject: [PATCH 77/77] [Google Maps] double hyphens are not allowed in
 comments in XML.

---
 src/chrome/content/rules/GoogleMaps.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/chrome/content/rules/GoogleMaps.xml b/src/chrome/content/rules/GoogleMaps.xml
index c03a9a6e6683..b8b014f81110 100644
--- a/src/chrome/content/rules/GoogleMaps.xml
+++ b/src/chrome/content/rules/GoogleMaps.xml
@@ -2,7 +2,7 @@
 Ignore this error if it ever happens again, it's ok. Please reenable this ruleset if it happens again.
 Disabled by https-everywhere-checker because:
 Non-2xx HTTP code: http://maps-api-ssl.google.com/ (200) => https://maps-api-ssl.google.com/ (404)
-------
+- - - - - -
 
 	Problematic domains: