Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Side by Side Diff: chrome/browser/component_updater/test/component_updater_service_unittest.cc

Issue 590333002: Replace usage of basictypes.h with a combination of stdint.h and base/macros.h. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium 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 "chrome/browser/component_updater/test/component_updater_service_unitte st.h" 5 #include "chrome/browser/component_updater/test/component_updater_service_unitte st.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/values.h" 16 #include "base/values.h"
17 #include "chrome/browser/component_updater/component_updater_resource_throttle.h " 17 #include "chrome/browser/component_updater/component_updater_resource_throttle.h "
18 #include "chrome/common/chrome_paths.h" 18 #include "chrome/common/chrome_paths.h"
19 #include "components/component_updater/component_updater_utils.h" 19 #include "components/component_updater/component_updater_utils.h"
20 #include "components/component_updater/test/test_configurator.h" 20 #include "components/component_updater/test/test_configurator.h"
21 #include "components/component_updater/test/test_installer.h" 21 #include "components/component_updater/test/test_installer.h"
22 #include "components/component_updater/test/url_request_post_interceptor.h"
22 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
23 #include "content/public/browser/resource_controller.h" 24 #include "content/public/browser/resource_controller.h"
24 #include "content/public/browser/resource_request_info.h" 25 #include "content/public/browser/resource_request_info.h"
25 #include "content/public/browser/resource_throttle.h" 26 #include "content/public/browser/resource_throttle.h"
26 #include "libxml/globals.h" 27 #include "libxml/globals.h"
27 #include "net/base/upload_bytes_element_reader.h" 28 #include "net/base/upload_bytes_element_reader.h"
29 #include "net/url_request/test_url_request_interceptor.h"
28 #include "net/url_request/url_fetcher.h" 30 #include "net/url_request/url_fetcher.h"
29 #include "net/url_request/url_request.h" 31 #include "net/url_request/url_request.h"
30 #include "net/url_request/url_request_test_util.h" 32 #include "net/url_request/url_request_test_util.h"
31 #include "url/gurl.h" 33 #include "url/gurl.h"
32 34
33 using content::BrowserThread; 35 using content::BrowserThread;
34 36
35 using ::testing::_; 37 using ::testing::_;
36 using ::testing::AnyNumber; 38 using ::testing::AnyNumber;
37 using ::testing::InSequence; 39 using ::testing::InSequence;
(...skipping 1453 matching lines...) Expand 10 before | Expand all | Expand 10 after
1491 component_updater()->RemoveObserver(&observer2); 1493 component_updater()->RemoveObserver(&observer2);
1492 1494
1493 test_configurator()->SetLoopCount(1); 1495 test_configurator()->SetLoopCount(1);
1494 component_updater()->Start(); 1496 component_updater()->Start();
1495 RunThreads(); 1497 RunThreads();
1496 1498
1497 component_updater()->Stop(); 1499 component_updater()->Stop();
1498 } 1500 }
1499 1501
1500 } // namespace component_updater 1502 } // namespace component_updater
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698