| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. | 1 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <unistd.h> | 5 #include <unistd.h> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 #include <base/scoped_ptr.h> | 8 #include <base/scoped_ptr.h> |
| 9 #include <glib.h> | 9 #include <glib.h> |
| 10 #include <gtest/gtest.h> | 10 #include <gtest/gtest.h> |
| 11 #include "chromeos/obsolete_logging.h" | 11 #include "base/logging.h" |
| 12 #include "update_engine/libcurl_http_fetcher.h" | 12 #include "update_engine/libcurl_http_fetcher.h" |
| 13 #include "update_engine/mock_http_fetcher.h" | 13 #include "update_engine/mock_http_fetcher.h" |
| 14 | 14 |
| 15 using std::string; | 15 using std::string; |
| 16 using std::vector; | 16 using std::vector; |
| 17 | 17 |
| 18 namespace chromeos_update_engine { | 18 namespace chromeos_update_engine { |
| 19 | 19 |
| 20 namespace { | 20 namespace { |
| 21 // WARNING, if you update this, you must also update test_http_server.py | 21 // WARNING, if you update this, you must also update test_http_server.py |
| (...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 442 | 442 |
| 443 g_timeout_add(0, StartTransfer, &start_xfer_args); | 443 g_timeout_add(0, StartTransfer, &start_xfer_args); |
| 444 g_main_loop_run(loop); | 444 g_main_loop_run(loop); |
| 445 | 445 |
| 446 // Exiting and testing happens in the delegate | 446 // Exiting and testing happens in the delegate |
| 447 } | 447 } |
| 448 g_main_loop_unref(loop); | 448 g_main_loop_unref(loop); |
| 449 } | 449 } |
| 450 | 450 |
| 451 } // namespace chromeos_update_engine | 451 } // namespace chromeos_update_engine |
| OLD | NEW |