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

Side by Side Diff: content/browser/download/download_id_unittest.cc

Issue 8400060: Switch content tests to use BrowserThreadImpl directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to lkgr Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "content/browser/download/download_id.h" 5 #include "content/browser/download/download_id.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
11 11
12 #include "content/browser/browser_thread_impl.h"
12 #include "content/browser/download/mock_download_manager.h" 13 #include "content/browser/download/mock_download_manager.h"
13 #include "content/browser/download/mock_download_manager_delegate.h" 14 #include "content/browser/download/mock_download_manager_delegate.h"
14 #include "content/test/test_browser_thread.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 using content::BrowserThreadImpl;
18
17 class DownloadIdTest : public testing::Test { 19 class DownloadIdTest : public testing::Test {
18 public: 20 public:
19 DownloadIdTest() 21 DownloadIdTest()
20 : download_manager_delegate_(new MockDownloadManagerDelegate), 22 : download_manager_delegate_(new MockDownloadManagerDelegate),
21 ui_thread_(BrowserThread::UI, &message_loop_) { 23 ui_thread_(BrowserThread::UI, &message_loop_) {
22 num_managers_ = ARRAYSIZE_UNSAFE(download_managers_); 24 num_managers_ = ARRAYSIZE_UNSAFE(download_managers_);
23 std::vector<MockDownloadManager*> managers; 25 std::vector<MockDownloadManager*> managers;
24 managers.resize(num_managers_); 26 managers.resize(num_managers_);
25 size_t i; 27 size_t i;
26 // Create the download managers. 28 // Create the download managers.
(...skipping 13 matching lines...) Expand all
40 ~DownloadIdTest() { 42 ~DownloadIdTest() {
41 for (size_t i = 0; i < num_managers_; ++i) 43 for (size_t i = 0; i < num_managers_; ++i)
42 download_managers_[i] = NULL; // Releases & deletes. 44 download_managers_[i] = NULL; // Releases & deletes.
43 } 45 }
44 46
45 protected: 47 protected:
46 scoped_ptr<MockDownloadManagerDelegate> download_manager_delegate_; 48 scoped_ptr<MockDownloadManagerDelegate> download_manager_delegate_;
47 scoped_refptr<DownloadManager> download_managers_[2]; 49 scoped_refptr<DownloadManager> download_managers_[2];
48 MessageLoopForUI message_loop_; 50 MessageLoopForUI message_loop_;
49 // Necessary to delete |DownloadManager|s. 51 // Necessary to delete |DownloadManager|s.
50 content::TestBrowserThread ui_thread_; 52 BrowserThreadImpl ui_thread_;
51 size_t num_managers_; 53 size_t num_managers_;
52 54
53 DISALLOW_COPY_AND_ASSIGN(DownloadIdTest); 55 DISALLOW_COPY_AND_ASSIGN(DownloadIdTest);
54 }; 56 };
55 57
56 TEST_F(DownloadIdTest, Local) { 58 TEST_F(DownloadIdTest, Local) {
57 DownloadId id1(download_managers_[0], 23); 59 DownloadId id1(download_managers_[0], 23);
58 DownloadId id2(download_managers_[0], 25); 60 DownloadId id2(download_managers_[0], 25);
59 61
60 EXPECT_EQ(23, id1.local()); 62 EXPECT_EQ(23, id1.local());
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 EXPECT_EQ(kLocalId[2], map[id3]); 144 EXPECT_EQ(kLocalId[2], map[id3]);
143 last = map.end(); 145 last = map.end();
144 EXPECT_FALSE(last == map.find(id1)); 146 EXPECT_FALSE(last == map.find(id1));
145 EXPECT_FALSE(last == map.find(id2)); 147 EXPECT_FALSE(last == map.find(id2));
146 EXPECT_FALSE(last == map.find(id3)); 148 EXPECT_FALSE(last == map.find(id3));
147 149
148 EXPECT_FALSE(id1 == id2); 150 EXPECT_FALSE(id1 == id2);
149 EXPECT_LT(id1, id2); 151 EXPECT_LT(id1, id2);
150 } 152 }
151 153
OLDNEW
« no previous file with comments | « content/browser/download/download_file_unittest.cc ('k') | content/browser/download/save_package_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698