Commit 8816ae54 authored by jamescook's avatar jamescook Committed by Commit bot

Move ExtensionProtocolsTest back to src/chrome

It lives in src/extensions now, but has src/chrome dependencies and tests
code implemented in src/chrome. Attempting to refactor it to split out the
src/chrome dependencies just made a mess of the code. Since it tests Chrome
concepts, put it there.

BUG=397164
TEST=unit_tests

Review URL: https://codereview.chromium.org/546633003

Cr-Commit-Position: refs/heads/master@{#293541}
parent 8f606820
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/values.h" #include "base/values.h"
#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths.h"
//#include "chrome/common/url_constants.h"
#include "content/public/browser/resource_request_info.h" #include "content/public/browser/resource_request_info.h"
#include "content/public/test/mock_resource_context.h" #include "content/public/test/mock_resource_context.h"
#include "content/public/test/test_browser_thread_bundle.h" #include "content/public/test/test_browser_thread_bundle.h"
...@@ -29,6 +28,7 @@ ...@@ -29,6 +28,7 @@
using content::ResourceType; using content::ResourceType;
namespace extensions { namespace extensions {
namespace {
scoped_refptr<Extension> CreateTestExtension(const std::string& name, scoped_refptr<Extension> CreateTestExtension(const std::string& name,
bool incognito_split_mode) { bool incognito_split_mode) {
...@@ -89,6 +89,11 @@ scoped_refptr<Extension> CreateTestResponseHeaderExtension() { ...@@ -89,6 +89,11 @@ scoped_refptr<Extension> CreateTestResponseHeaderExtension() {
return extension; return extension;
} }
} // namespace
// This test lives in src/chrome instead of src/extensions because it tests
// functionality delegated back to Chrome via ChromeExtensionsBrowserClient.
// See chrome/browser/extensions/url_request_util.cc.
class ExtensionProtocolTest : public testing::Test { class ExtensionProtocolTest : public testing::Test {
public: public:
ExtensionProtocolTest() ExtensionProtocolTest()
......
...@@ -21,7 +21,8 @@ namespace extensions { ...@@ -21,7 +21,8 @@ namespace extensions {
class Extension; class Extension;
class InfoMap; class InfoMap;
// Utilities related to URLRequest jobs for extension resources. // Utilities related to URLRequest jobs for extension resources. See
// chrome/browser/extensions/extension_protocols_unittest.cc for related tests.
namespace url_request_util { namespace url_request_util {
// Returns true to allow a chrome-extension:// resource request coming from // Returns true to allow a chrome-extension:// resource request coming from
......
...@@ -542,7 +542,6 @@ ...@@ -542,7 +542,6 @@
'../extensions/browser/extension_error_test_util.cc', '../extensions/browser/extension_error_test_util.cc',
'../extensions/browser/extension_error_test_util.h', '../extensions/browser/extension_error_test_util.h',
'../extensions/browser/extension_icon_image_unittest.cc', '../extensions/browser/extension_icon_image_unittest.cc',
'../extensions/browser/extension_protocols_unittest.cc',
'../extensions/common/extension_l10n_util_unittest.cc', '../extensions/common/extension_l10n_util_unittest.cc',
'../extensions/common/features/base_feature_provider_unittest.cc', '../extensions/common/features/base_feature_provider_unittest.cc',
'../extensions/common/features/complex_feature_unittest.cc', '../extensions/common/features/complex_feature_unittest.cc',
...@@ -943,6 +942,7 @@ ...@@ -943,6 +942,7 @@
'browser/extensions/extension_path_util_unittest.cc', 'browser/extensions/extension_path_util_unittest.cc',
'browser/extensions/extension_prefs_unittest.cc', 'browser/extensions/extension_prefs_unittest.cc',
'browser/extensions/extension_prefs_unittest.h', 'browser/extensions/extension_prefs_unittest.h',
'browser/extensions/extension_protocols_unittest.cc',
'browser/extensions/extension_service_test_base.h', 'browser/extensions/extension_service_test_base.h',
'browser/extensions/extension_service_test_base.cc', 'browser/extensions/extension_service_test_base.cc',
'browser/extensions/extension_service_unittest.cc', 'browser/extensions/extension_service_unittest.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment