| Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| index d7f2ea4ba230937dd56313c60d7704fd0515cdf3..14976b7b58587a20049e30f11b8594bff7bca9f3 100644
|
| --- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| +++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| @@ -32,7 +32,7 @@ namespace keys = declarative_webrequest_constants;
|
|
|
| TEST(WebRequestConditionAttributeTest, CreateConditionAttribute) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| std::string error;
|
| scoped_ptr<WebRequestConditionAttribute> result;
|
| @@ -72,7 +72,7 @@ TEST(WebRequestConditionAttributeTest, CreateConditionAttribute) {
|
|
|
| TEST(WebRequestConditionAttributeTest, ResourceType) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| std::string error;
|
| ListValue resource_types;
|
| @@ -104,7 +104,7 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
|
|
|
| TEST(WebRequestConditionAttributeTest, ContentType) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| std::string error;
|
| scoped_ptr<WebRequestConditionAttribute> result;
|
| @@ -121,7 +121,7 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
|
| net::TestURLRequest url_request(
|
| test_server.GetURL("files/headers.html"), &delegate, &context, NULL);
|
| url_request.Start();
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| ListValue content_types;
|
| content_types.Append(Value::CreateStringValue("text/plain"));
|
| @@ -170,7 +170,7 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
|
| // Testing WebRequestConditionAttributeThirdParty.
|
| TEST(WebRequestConditionAttributeTest, ThirdParty) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| std::string error;
|
| const FundamentalValue value_true(true);
|
| @@ -227,7 +227,7 @@ TEST(WebRequestConditionAttributeTest, ThirdParty) {
|
| // applicable in all stages.
|
| TEST(WebRequestConditionAttributeTest, Stages) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| typedef std::pair<RequestStage, const char*> StageNamePair;
|
| static const StageNamePair active_stages[] = {
|
| @@ -399,7 +399,7 @@ void MatchAndCheck(const std::vector< std::vector<const std::string*> >& tests,
|
| // by both types of condition attributes, so it is enough to test it once.
|
| TEST(WebRequestConditionAttributeTest, RequestHeaders) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| net::TestURLRequestContext context;
|
| net::TestDelegate delegate;
|
| @@ -408,7 +408,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
|
| url_request.SetExtraRequestHeaderByName(
|
| "Custom-header", "custom/value", true /* overwrite */);
|
| url_request.Start();
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| std::vector<std::vector<const std::string*> > tests;
|
| bool result = false;
|
| @@ -477,7 +477,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
|
| // 3. Negating the match in case of 'doesNotContainHeaders'.
|
| TEST(WebRequestConditionAttributeTest, ResponseHeaders) {
|
| // Necessary for TestURLRequest.
|
| - MessageLoop message_loop(MessageLoop::TYPE_IO);
|
| + base::MessageLoop message_loop(base::MessageLoop::TYPE_IO);
|
|
|
| net::TestServer test_server(
|
| net::TestServer::TYPE_HTTP,
|
| @@ -491,7 +491,7 @@ TEST(WebRequestConditionAttributeTest, ResponseHeaders) {
|
| net::TestURLRequest url_request(test_server.GetURL("files/headers.html"),
|
| &delegate, &context, NULL);
|
| url_request.Start();
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| // In all the tests below we assume that the server includes the headers
|
| // Custom-Header: custom/value
|
|
|