AU: MultiHttpFetcher cleanup/rewrite

SConstruct

 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 # Protobuffer compilation
 def ProtocolBufferEmitter(target, source, env):
   """ Inputs:
           target: list of targets to compile to
@@ skipping 212 matching lines @@
 env.ParseConfig('pkg-config --cflags --libs '
                 'dbus-1 dbus-glib-1 gio-2.0 gio-unix-2.0 glib-2.0')
 env.ProtocolBuffer('update_metadata.pb.cc', 'update_metadata.proto')
 env.PublicKey('unittest_key.pub.pem', 'unittest_key.pem')
 
 env.DbusBindings('update_engine.dbusclient.h', 'update_engine.xml')
 
 env.GlibMarshal('marshal.glibmarshal.c', 'marshal.list')
 
 if ARGUMENTS.get('debug', 0):
-  env['CCFLAGS'] += ' -fprofile-arcs -ftest-coverage'
+  env['CCFLAGS'] += ['-fprofile-arcs', '-ftest-coverage']
   env['LIBS'] += ['bz2', 'gcov']
 
 sources = Split("""action_processor.cc
                    buffered_file_writer.cc
                    bzip.cc
                    bzip_extent_writer.cc
                    chrome_proxy_resolver.cc
                    cycle_breaker.cc
                    dbus_service.cc
                    decompressing_file_writer.cc
                    delta_diff_generator.cc
                    delta_performer.cc
                    download_action.cc
                    extent_mapper.cc
                    extent_ranges.cc
                    extent_writer.cc
                    filesystem_copier_action.cc
                    filesystem_iterator.cc
                    file_writer.cc
                    flimflam_proxy.cc
                    full_update_generator.cc
                    graph_utils.cc
                    gzip.cc
                    http_fetcher.cc
                    libcurl_http_fetcher.cc
                    marshal.glibmarshal.c
                    metadata.cc
+                   multi_range_http_fetcher.cc
                    omaha_hash_calculator.cc
                    omaha_request_action.cc
                    omaha_request_params.cc
                    omaha_response_handler_action.cc
                    payload_signer.cc
                    postinstall_runner_action.cc
                    prefs.cc
                    proxy_resolver.cc
                    simple_key_value_store.cc
                    split_file_writer.cc
@@ skipping 83 matching lines @@
 delta_generator_cmd = env.Program('delta_generator',
                                   delta_generator_main)
 
 http_server_cmd = env.Program('test_http_server', 'test_http_server.cc')
 
 unittest_env = env.Clone()
 unittest_env.Append(LIBS=['gmock', 'gtest'])
 unittest_cmd = unittest_env.Program('update_engine_unittests',
                            unittest_sources + unittest_main)
 Clean(unittest_cmd, Glob('*.gcda') + Glob('*.gcno') + Glob('*.gcov') +
-                    Split('html app.info'))
+                    Split('html app.info'))