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

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

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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 "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion.h" 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/test/values_test_util.h" 10 #include "base/test/values_test_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h" 12 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h"
13 #include "components/url_matcher/url_matcher_constants.h" 13 #include "components/url_matcher/url_matcher_constants.h"
14 #include "content/public/browser/resource_request_info.h" 14 #include "content/public/browser/resource_request_info.h"
15 #include "net/base/request_priority.h" 15 #include "net/base/request_priority.h"
16 #include "net/url_request/url_request_test_util.h" 16 #include "net/url_request/url_request_test_util.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 18
19 using content::ResourceType;
19 using url_matcher::URLMatcher; 20 using url_matcher::URLMatcher;
20 using url_matcher::URLMatcherConditionSet; 21 using url_matcher::URLMatcherConditionSet;
21 22
22 namespace extensions { 23 namespace extensions {
23 24
24 TEST(WebRequestConditionTest, CreateCondition) { 25 TEST(WebRequestConditionTest, CreateCondition) {
25 // Necessary for TestURLRequest. 26 // Necessary for TestURLRequest.
26 base::MessageLoopForIO message_loop; 27 base::MessageLoopForIO message_loop;
27 URLMatcher matcher; 28 URLMatcher matcher;
28 29
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
367 // filters. 368 // filters.
368 " \"requestHeaders\": [{}], \n" 369 " \"requestHeaders\": [{}], \n"
369 " \"responseHeaders\": [{}], \n" 370 " \"responseHeaders\": [{}], \n"
370 "}"), 371 "}"),
371 &error); 372 &error);
372 EXPECT_FALSE(error.empty()); 373 EXPECT_FALSE(error.empty());
373 EXPECT_FALSE(result.get()); 374 EXPECT_FALSE(result.get());
374 } 375 }
375 376
376 } // namespace extensions 377 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698