| OLD | NEW |
| 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 <queue> | 5 #include <queue> |
| 6 #include <map> | 6 #include <map> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
| 11 #include "base/json/json_value_serializer.h" | 11 #include "base/json/json_string_value_serializer.h" |
| 12 #include "base/memory/weak_ptr.h" | 12 #include "base/memory/weak_ptr.h" |
| 13 #include "base/path_service.h" | 13 #include "base/path_service.h" |
| 14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
| 16 #include "chrome/browser/extensions/api/webrequest/webrequest_api.h" | 16 #include "chrome/browser/extensions/api/webrequest/webrequest_api.h" |
| 17 #include "chrome/browser/extensions/api/webrequest/webrequest_api_constants.h" | 17 #include "chrome/browser/extensions/api/webrequest/webrequest_api_constants.h" |
| 18 #include "chrome/browser/extensions/api/webrequest/webrequest_api_helpers.h" | 18 #include "chrome/browser/extensions/api/webrequest/webrequest_api_helpers.h" |
| 19 #include "chrome/browser/extensions/extension_event_router_forwarder.h" | 19 #include "chrome/browser/extensions/extension_event_router_forwarder.h" |
| 20 #include "chrome/browser/net/chrome_network_delegate.h" | 20 #include "chrome/browser/net/chrome_network_delegate.h" |
| 21 #include "chrome/browser/prefs/pref_member.h" | 21 #include "chrome/browser/prefs/pref_member.h" |
| (...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1413 credentials_set = MergeOnAuthRequiredResponses( | 1413 credentials_set = MergeOnAuthRequiredResponses( |
| 1414 deltas, &auth3, &conflicting_extensions, &event_log); | 1414 deltas, &auth3, &conflicting_extensions, &event_log); |
| 1415 EXPECT_TRUE(credentials_set); | 1415 EXPECT_TRUE(credentials_set); |
| 1416 EXPECT_FALSE(auth3.Empty()); | 1416 EXPECT_FALSE(auth3.Empty()); |
| 1417 EXPECT_EQ(username, auth1.username()); | 1417 EXPECT_EQ(username, auth1.username()); |
| 1418 EXPECT_EQ(password, auth1.password()); | 1418 EXPECT_EQ(password, auth1.password()); |
| 1419 EXPECT_EQ(1u, conflicting_extensions.size()); | 1419 EXPECT_EQ(1u, conflicting_extensions.size()); |
| 1420 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); | 1420 EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2")); |
| 1421 EXPECT_EQ(3u, event_log.size()); | 1421 EXPECT_EQ(3u, event_log.size()); |
| 1422 } | 1422 } |
| OLD | NEW |