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

Side by Side Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

Issue 2315443004: Remove calls to deprecated MessageLoop methods in chrome. (Closed)
Patch Set: remove unused include Created 4 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 (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 "extensions/browser/api/declarative_webrequest/webrequest_rules_registr y.h" 5 #include "extensions/browser/api/declarative_webrequest/webrequest_rules_registr y.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/json/json_reader.h" 13 #include "base/json/json_reader.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/linked_ptr.h" 15 #include "base/memory/linked_ptr.h"
16 #include "base/message_loop/message_loop.h" 16 #include "base/message_loop/message_loop.h"
17 #include "base/run_loop.h"
17 #include "base/stl_util.h" 18 #include "base/stl_util.h"
18 #include "base/test/values_test_util.h" 19 #include "base/test/values_test_util.h"
19 #include "base/values.h" 20 #include "base/values.h"
20 #include "chrome/common/extensions/extension_test_util.h" 21 #include "chrome/common/extensions/extension_test_util.h"
21 #include "components/url_matcher/url_matcher_constants.h" 22 #include "components/url_matcher/url_matcher_constants.h"
22 #include "content/public/test/test_browser_thread.h" 23 #include "content/public/test/test_browser_thread.h"
23 #include "extensions/browser/api/declarative/rules_registry_service.h" 24 #include "extensions/browser/api/declarative/rules_registry_service.h"
24 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h" 25 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"
25 #include "extensions/browser/api/web_request/web_request_api_helpers.h" 26 #include "extensions/browser/api/web_request/web_request_api_helpers.h"
26 #include "net/base/request_priority.h" 27 #include "net/base/request_priority.h"
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 WebRequestRulesRegistryTest() 87 WebRequestRulesRegistryTest()
87 : ui_(content::BrowserThread::UI, &message_loop_), 88 : ui_(content::BrowserThread::UI, &message_loop_),
88 io_(content::BrowserThread::IO, &message_loop_) {} 89 io_(content::BrowserThread::IO, &message_loop_) {}
89 90
90 ~WebRequestRulesRegistryTest() override {} 91 ~WebRequestRulesRegistryTest() override {}
91 92
92 void SetUp() override; 93 void SetUp() override;
93 94
94 void TearDown() override { 95 void TearDown() override {
95 // Make sure that deletion traits of all registries are executed. 96 // Make sure that deletion traits of all registries are executed.
96 message_loop_.RunUntilIdle(); 97 base::RunLoop().RunUntilIdle();
97 } 98 }
98 99
99 // Returns a rule that roughly matches http://*.example.com and 100 // Returns a rule that roughly matches http://*.example.com and
100 // https://www.example.com and cancels it 101 // https://www.example.com and cancels it
101 linked_ptr<api::events::Rule> CreateRule1() { 102 linked_ptr<api::events::Rule> CreateRule1() {
102 base::ListValue* scheme_http = new base::ListValue(); 103 base::ListValue* scheme_http = new base::ListValue();
103 scheme_http->AppendString("http"); 104 scheme_http->AppendString("http");
104 base::DictionaryValue* http_condition_dict = new base::DictionaryValue(); 105 base::DictionaryValue* http_condition_dict = new base::DictionaryValue();
105 http_condition_dict->Set(keys2::kSchemesKey, scheme_http); 106 http_condition_dict->Set(keys2::kSchemesKey, scheme_http);
106 http_condition_dict->SetString(keys2::kHostSuffixKey, "example.com"); 107 http_condition_dict->SetString(keys2::kHostSuffixKey, "example.com");
(...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after
811 // This is a correct match. 812 // This is a correct match.
812 GURL url2("http://foo.com/index.html"); 813 GURL url2("http://foo.com/index.html");
813 std::unique_ptr<net::URLRequest> request2( 814 std::unique_ptr<net::URLRequest> request2(
814 context.CreateRequest(url2, net::DEFAULT_PRIORITY, NULL)); 815 context.CreateRequest(url2, net::DEFAULT_PRIORITY, NULL));
815 WebRequestData request_data2(request2.get(), ON_BEFORE_REQUEST); 816 WebRequestData request_data2(request2.get(), ON_BEFORE_REQUEST);
816 deltas = registry->CreateDeltas(NULL, request_data2, false); 817 deltas = registry->CreateDeltas(NULL, request_data2, false);
817 EXPECT_EQ(1u, deltas.size()); 818 EXPECT_EQ(1u, deltas.size());
818 } 819 }
819 820
820 } // namespace extensions 821 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698