Merge 241734 "Added support for multiple urls in the component u..."

chrome/browser/component_updater/test/component_updater_ping_manager_unittest.cc

 // Copyright 2013 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 "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/version.h"
 #include "chrome/browser/component_updater/component_updater_ping_manager.h"
 #include "chrome/browser/component_updater/crx_update_item.h"
 #include "chrome/browser/component_updater/test/component_updater_service_unittest.h"
@@ skipping 98 matching lines @@
   item.next_version = base::Version("2.0");
   item.previous_fp = "prev fp";
   item.next_fp = "next fp";
   item.error_category = 1;
   item.error_code = 2;
   item.extra_code1 = -1;
   item.diff_error_category = 10;
   item.diff_error_code = 20;
   item.diff_extra_code1 = -10;
   item.diff_update_failed = true;
-  item.diff_crx_url = GURL("http://host/path");
+  item.crx_diffurls.push_back(GURL("http://host/path"));
 
   ping_manager_->OnUpdateComplete(&item);
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString();
   EXPECT_NE(string::npos, interceptor->GetRequests()[0].find(
       "<app appid=\"abc\" version=\"1.0\" nextversion=\"2.0\">"
       "<event eventtype=\"3\" eventresult=\"0\" errorcat=\"1\" "
       "errorcode=\"2\" extracode1=\"-1\" diffresult=\"0\" differrorcat=\"10\" "
       "differrorcode=\"20\" diffextracode1=\"-10\" "
@@ skipping 38 matching lines @@
       "total=\"456\" download_time_ms=\"987\"/>"
       "<event eventtype=\"14\" eventresult=\"1\" downloader=\"bits\" "
       "url=\"http://host2/path2\" downloaded=\"1230\" total=\"4560\" "
       "download_time_ms=\"9870\"/></app>"))
       << interceptor->GetRequestsAsString();
   interceptor->Reset();
 }
 
 }  // namespace component_updater