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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 12518036: net: move host_resolver files from net/base to net/dns (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 <map> 5 #include <map>
6 #include <queue> 6 #include <queue>
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 21 matching lines...) Expand all
32 #include "chrome/common/extensions/extension_messages.h" 32 #include "chrome/common/extensions/extension_messages.h"
33 #include "chrome/common/extensions/features/feature.h" 33 #include "chrome/common/extensions/features/feature.h"
34 #include "chrome/common/pref_names.h" 34 #include "chrome/common/pref_names.h"
35 #include "chrome/test/base/testing_browser_process.h" 35 #include "chrome/test/base/testing_browser_process.h"
36 #include "chrome/test/base/testing_pref_service_syncable.h" 36 #include "chrome/test/base/testing_pref_service_syncable.h"
37 #include "chrome/test/base/testing_profile.h" 37 #include "chrome/test/base/testing_profile.h"
38 #include "chrome/test/base/testing_profile_manager.h" 38 #include "chrome/test/base/testing_profile_manager.h"
39 #include "content/public/test/test_browser_thread.h" 39 #include "content/public/test/test_browser_thread.h"
40 #include "net/base/auth.h" 40 #include "net/base/auth.h"
41 #include "net/base/capturing_net_log.h" 41 #include "net/base/capturing_net_log.h"
42 #include "net/base/mock_host_resolver.h"
43 #include "net/base/net_util.h" 42 #include "net/base/net_util.h"
44 #include "net/base/upload_bytes_element_reader.h" 43 #include "net/base/upload_bytes_element_reader.h"
45 #include "net/base/upload_data_stream.h" 44 #include "net/base/upload_data_stream.h"
46 #include "net/base/upload_file_element_reader.h" 45 #include "net/base/upload_file_element_reader.h"
46 #include "net/dns/mock_host_resolver.h"
47 #include "net/url_request/url_request_test_util.h" 47 #include "net/url_request/url_request_test_util.h"
48 #include "testing/gtest/include/gtest/gtest-message.h" 48 #include "testing/gtest/include/gtest/gtest-message.h"
49 #include "testing/gtest/include/gtest/gtest.h" 49 #include "testing/gtest/include/gtest/gtest.h"
50 50
51 namespace helpers = extension_web_request_api_helpers; 51 namespace helpers = extension_web_request_api_helpers;
52 namespace keys = extension_web_request_api_constants; 52 namespace keys = extension_web_request_api_constants;
53 53
54 using base::BinaryValue; 54 using base::BinaryValue;
55 using base::DictionaryValue; 55 using base::DictionaryValue;
56 using base::ListValue; 56 using base::ListValue;
(...skipping 2068 matching lines...) Expand 10 before | Expand all | Expand 10 after
2125 EXPECT_TRUE(credentials_set); 2125 EXPECT_TRUE(credentials_set);
2126 EXPECT_FALSE(auth3.Empty()); 2126 EXPECT_FALSE(auth3.Empty());
2127 EXPECT_EQ(username, auth1.username()); 2127 EXPECT_EQ(username, auth1.username());
2128 EXPECT_EQ(password, auth1.password()); 2128 EXPECT_EQ(password, auth1.password());
2129 EXPECT_EQ(1u, warning_set.size()); 2129 EXPECT_EQ(1u, warning_set.size());
2130 EXPECT_TRUE(HasWarning(warning_set, "extid2")); 2130 EXPECT_TRUE(HasWarning(warning_set, "extid2"));
2131 EXPECT_EQ(3u, capturing_net_log.GetSize()); 2131 EXPECT_EQ(3u, capturing_net_log.GetSize());
2132 } 2132 }
2133 2133
2134 } // namespace extensions 2134 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698