Check ChromeToMobileService OriginalURLs before handling.

chrome/browser/chrome_to_mobile_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_to_mobile_service.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/guid.h"
@@ skipping 319 matching lines @@
 void ChromeToMobileService::Shutdown() {
   // TODO(msw): Unit tests do not provide profiles; see http://crbug.com/122183
   // Unregister for cloud print device list invalidation notifications.
   ProfileSyncService* profile_sync_service =
       profile_ ? ProfileSyncServiceFactory::GetForProfile(profile_) : NULL;
   if (profile_sync_service)
     profile_sync_service->UnregisterInvalidationHandler(this);
 }
 
 void ChromeToMobileService::OnURLFetchComplete(const net::URLFetcher* source) {
-  if (source->GetURL() == GetSearchURL(cloud_print_url_))
+  if (source->GetOriginalURL() == GetSearchURL(cloud_print_url_))
     HandleSearchResponse(source);
+  else if (source->GetOriginalURL() == GetSubmitURL(cloud_print_url_))
+    HandleSubmitResponse(source);
   else
-    HandleSubmitResponse(source);
+    NOTREACHED();
 
   // Remove the URLFetcher from the ScopedVector; this deletes the URLFetcher.
   for (ScopedVector<net::URLFetcher>::iterator it = url_fetchers_.begin();
        it != url_fetchers_.end(); ++it) {
     if (*it == source) {
       url_fetchers_.erase(it);
       break;
     }
   }
 }
@@ skipping 229 matching lines @@
   net::URLFetcher* search_request = net::URLFetcher::Create(
       GetSearchURL(cloud_print_url_), net::URLFetcher::GET, this);
   url_fetchers_.push_back(search_request);
   InitRequest(search_request);
   search_request->Start();
 }
 
 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;
   ListValue* list = NULL;
   DictionaryValue* dictionary = NULL;
   source->GetResponseAsString(&data);
   scoped_ptr<Value> json(base::JSONReader::Read(data));
   if (json.get() && json->GetAsDictionary(&dictionary) && dictionary &&
       dictionary->GetList(cloud_print::kPrinterListValue, &list)) {
     std::string type, name, id;
@@ skipping 32 matching lines @@
   // Update the cached mobile device list in profile prefs.
   profile_->GetPrefs()->Set(prefs::kChromeToMobileDeviceList, mobiles);
   if (HasMobiles())
     LogMetric(DEVICES_AVAILABLE);
   UpdateCommandState();
 }
 
 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;
   source->GetResponseAsString(&data);
   DictionaryValue* dictionary = NULL;
   scoped_ptr<Value> json(base::JSONReader::Read(data));
   if (json.get() && json->GetAsDictionary(&dictionary) && dictionary) {
     dictionary->GetBoolean("success", &success);
     int error_code = -1;
     if (dictionary->GetInteger("errorCode", &error_code))
@@ skipping 27 matching lines @@
 
       // Report failure below and ignore the second response.
       request_observer_map_.erase(other);
       break;
     }
   }
 
   if (observer.get())
     observer->OnSendComplete(success);
 }