Check ChromeToMobileService OriginalURLs before handling.

chrome/browser/chrome_to_mobile_service.cc

Index: chrome/browser/chrome_to_mobile_service.cc
diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc
index b2237e02ff42fd31cb09342a2fa12cb1507e0a50..b6ab90d635338d531b188ea9f86e0bc384d22c61 100644
--- a/chrome/browser/chrome_to_mobile_service.cc
+++ b/chrome/browser/chrome_to_mobile_service.cc
@@ -337,10 +337,12 @@ void ChromeToMobileService::Shutdown() {
 }
 
 void ChromeToMobileService::OnURLFetchComplete(const net::URLFetcher* source) {
-  if (source->GetURL() == GetSearchURL(cloud_print_url_))
+  if (source->GetOriginalURL() == GetSearchURL(cloud_print_url_))
     HandleSearchResponse(source);
-  else
+  else if (source->GetOriginalURL() == GetSubmitURL(cloud_print_url_))
     HandleSubmitResponse(source);
+  else
+    NOTREACHED();
 
   // Remove the URLFetcher from the ScopedVector; this deletes the URLFetcher.
   for (ScopedVector<net::URLFetcher>::iterator it = url_fetchers_.begin();
@@ -590,7 +592,7 @@ void ChromeToMobileService::RequestDeviceSearch() {
 void ChromeToMobileService::HandleSearchResponse(
     const net::URLFetcher* source) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
-  DCHECK_EQ(source->GetURL(), GetSearchURL(cloud_print_url_));
+  DCHECK_EQ(source->GetOriginalURL(), GetSearchURL(cloud_print_url_));
 
   ListValue mobiles;
   std::string data;
@@ -643,6 +645,8 @@ void ChromeToMobileService::HandleSearchResponse(
 void ChromeToMobileService::HandleSubmitResponse(
     const net::URLFetcher* source) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+  DCHECK_EQ(source->GetOriginalURL(), GetSubmitURL(cloud_print_url_));
+
   // Get the success value from the cloud print server response data.
   std::string data;
   bool success = false;