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

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

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged ToT Created 7 years, 6 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/web_request/web_request_permissions.h" 5 #include "chrome/browser/extensions/api/web_request/web_request_permissions.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "chrome/browser/extensions/extension_info_map.h" 8 #include "chrome/browser/extensions/extension_info_map.h"
9 #include "chrome/common/extensions/extension_constants.h" 9 #include "chrome/common/extensions/extension_constants.h"
10 #include "chrome/common/extensions/extension_manifest_constants.h" 10 #include "chrome/common/extensions/extension_manifest_constants.h"
11 #include "chrome/common/extensions/extension_test_util.h" 11 #include "chrome/common/extensions/extension_test_util.h"
12 #include "chrome/test/base/testing_profile.h" 12 #include "chrome/test/base/testing_profile.h"
13 #include "content/public/browser/resource_request_info.h" 13 #include "content/public/browser/resource_request_info.h"
14 #include "content/public/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread_bundle.h"
15 #include "net/url_request/url_request_test_util.h" 15 #include "net/url_request/url_request_test_util.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 using content::ResourceRequestInfo; 18 using content::ResourceRequestInfo;
19 using extensions::Extension; 19 using extensions::Extension;
20 using extensions::Manifest; 20 using extensions::Manifest;
21 using extension_test_util::LoadManifestUnchecked; 21 using extension_test_util::LoadManifestUnchecked;
22 22
23 class ExtensionWebRequestHelpersTestWithThreadsTest : public testing::Test { 23 class ExtensionWebRequestHelpersTestWithThreadsTest : public testing::Test {
24 public: 24 public:
25 ExtensionWebRequestHelpersTestWithThreadsTest() 25 ExtensionWebRequestHelpersTestWithThreadsTest()
26 : io_thread_(content::BrowserThread::IO, &message_loop_) {} 26 : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {}
27 27
28 protected: 28 protected:
29 virtual void SetUp() OVERRIDE; 29 virtual void SetUp() OVERRIDE;
30 30
31 protected: 31 protected:
32 net::TestURLRequestContext context; 32 net::TestURLRequestContext context;
33 33
34 // This extension has Web Request permissions, but no host permission. 34 // This extension has Web Request permissions, but no host permission.
35 scoped_refptr<Extension> permissionless_extension_; 35 scoped_refptr<Extension> permissionless_extension_;
36 // This extension has Web Request permissions, and *.com a host permission. 36 // This extension has Web Request permissions, and *.com a host permission.
37 scoped_refptr<Extension> com_extension_; 37 scoped_refptr<Extension> com_extension_;
38 scoped_refptr<ExtensionInfoMap> extension_info_map_; 38 scoped_refptr<ExtensionInfoMap> extension_info_map_;
39 39
40 private: 40 private:
41 base::MessageLoopForIO message_loop_; 41 content::TestBrowserThreadBundle thread_bundle_;
42 content::TestBrowserThread io_thread_;
43 }; 42 };
44 43
45 void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() { 44 void ExtensionWebRequestHelpersTestWithThreadsTest::SetUp() {
46 testing::Test::SetUp(); 45 testing::Test::SetUp();
47 46
48 std::string error; 47 std::string error;
49 permissionless_extension_ = LoadManifestUnchecked("permissions", 48 permissionless_extension_ = LoadManifestUnchecked("permissions",
50 "web_request_no_host.json", 49 "web_request_no_host.json",
51 Manifest::INVALID_LOCATION, 50 Manifest::INVALID_LOCATION,
52 Extension::NO_FLAGS, 51 Extension::NO_FLAGS,
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 request.url(), 165 request.url(),
167 false /*crosses_incognito*/, 166 false /*crosses_incognito*/,
168 WebRequestPermissions::REQUIRE_HOST_PERMISSION)); 167 WebRequestPermissions::REQUIRE_HOST_PERMISSION));
169 EXPECT_FALSE(WebRequestPermissions::CanExtensionAccessURL( 168 EXPECT_FALSE(WebRequestPermissions::CanExtensionAccessURL(
170 extension_info_map_.get(), 169 extension_info_map_.get(),
171 com_extension_->id(), 170 com_extension_->id(),
172 request.url(), 171 request.url(),
173 false /*crosses_incognito*/, 172 false /*crosses_incognito*/,
174 WebRequestPermissions::REQUIRE_ALL_URLS)); 173 WebRequestPermissions::REQUIRE_ALL_URLS));
175 } 174 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698