Commit d662b9d4 authored by Kevin McNee's avatar Kevin McNee Committed by Chromium LUCI CQ

Dedupe mime_handler_view test extension id

Several mime_handler_view tests have a copy of the test extension id.
We now use the common constant.

Bug: None
Change-Id: If9c08f486698a1c32fc9c2871a379e474589a2f3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2624771
Commit-Queue: Kevin McNee <mcnee@chromium.org>
Commit-Queue: James MacLean <wjmaclean@chromium.org>
Auto-Submit: Kevin McNee <mcnee@chromium.org>
Reviewed-by: default avatarJames MacLean <wjmaclean@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842666}
parent c1f0e65c
...@@ -62,10 +62,6 @@ using guest_view::GuestViewManager; ...@@ -62,10 +62,6 @@ using guest_view::GuestViewManager;
using guest_view::TestGuestViewManager; using guest_view::TestGuestViewManager;
using guest_view::TestGuestViewManagerFactory; using guest_view::TestGuestViewManagerFactory;
namespace {
constexpr char kTestExtensionId[] = "oickdpebdnfbgkcaoklfcdhjniefkcji";
}
// Note: This file contains several old WebViewGuest tests which were for // Note: This file contains several old WebViewGuest tests which were for
// certain BrowserPlugin features and no longer made sense for the new // certain BrowserPlugin features and no longer made sense for the new
// WebViewGuest which is based on cross-process frames. Since // WebViewGuest which is based on cross-process frames. Since
...@@ -123,7 +119,8 @@ class ChromeMimeHandlerViewTest : public extensions::ExtensionApiTest { ...@@ -123,7 +119,8 @@ class ChromeMimeHandlerViewTest : public extensions::ExtensionApiTest {
const extensions::Extension* extension = const extensions::Extension* extension =
LoadExtension(test_data_dir_.AppendASCII("mime_handler_view")); LoadExtension(test_data_dir_.AppendASCII("mime_handler_view"));
ASSERT_TRUE(extension); ASSERT_TRUE(extension);
CHECK_EQ(kTestExtensionId, extension->id()); ASSERT_EQ(std::string(extension_misc::kMimeHandlerPrivateTestExtensionId),
extension->id());
extensions::ResultCatcher catcher; extensions::ResultCatcher catcher;
ui_test_utils::NavigateToURL(browser(), url); ui_test_utils::NavigateToURL(browser(), url);
...@@ -156,11 +153,13 @@ class ChromeMimeHandlerViewTest : public extensions::ExtensionApiTest { ...@@ -156,11 +153,13 @@ class ChromeMimeHandlerViewTest : public extensions::ExtensionApiTest {
transferrable_loader->head->mime_type = "application/pdf"; transferrable_loader->head->mime_type = "application/pdf";
transferrable_loader->head->headers = transferrable_loader->head->headers =
base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/2 200 OK"); base::MakeRefCounted<net::HttpResponseHeaders>("HTTP/2 200 OK");
const std::string extension_id =
extension_misc::kMimeHandlerPrivateTestExtensionId;
return std::make_unique<extensions::StreamContainer>( return std::make_unique<extensions::StreamContainer>(
0 /* tab_id */, false /* embedded */, 0 /* tab_id */, false /* embedded */,
GURL(std::string(extensions::kExtensionScheme) + extensions::Extension::GetBaseURLFromExtensionId(
kTestExtensionId) /* handler_url */, extension_id) /* handler_url */,
kTestExtensionId, std::move(transferrable_loader), url); extension_id, std::move(transferrable_loader), url);
} }
private: private:
......
{ {
// This extension's id is allowed to handle mime types.
// chrome-extension://oickdpebdnfbgkcaoklfcdhjniefkcji
"name": "Test MIMEHandlerView", "name": "Test MIMEHandlerView",
"version": "1", "version": "1",
"manifest_version": 2, "manifest_version": 2,
......
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.h" #include "extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.h"
#include "extensions/browser/process_manager.h" #include "extensions/browser/process_manager.h"
#include "extensions/common/constants.h"
#include "extensions/common/guest_view/extensions_guest_view_messages.h" #include "extensions/common/guest_view/extensions_guest_view_messages.h"
#include "extensions/common/mojom/guest_view.mojom.h" #include "extensions/common/mojom/guest_view.mojom.h"
#include "extensions/test/result_catcher.h" #include "extensions/test/result_catcher.h"
...@@ -58,9 +59,6 @@ using guest_view::GuestViewManagerDelegate; ...@@ -58,9 +59,6 @@ using guest_view::GuestViewManagerDelegate;
using guest_view::TestGuestViewManager; using guest_view::TestGuestViewManager;
using guest_view::TestGuestViewManagerFactory; using guest_view::TestGuestViewManagerFactory;
// The test extension id is set by the key value in the manifest.
const char kExtensionId[] = "oickdpebdnfbgkcaoklfcdhjniefkcji";
class MimeHandlerViewTest : public extensions::ExtensionApiTest { class MimeHandlerViewTest : public extensions::ExtensionApiTest {
public: public:
MimeHandlerViewTest() { MimeHandlerViewTest() {
...@@ -117,7 +115,8 @@ class MimeHandlerViewTest : public extensions::ExtensionApiTest { ...@@ -117,7 +115,8 @@ class MimeHandlerViewTest : public extensions::ExtensionApiTest {
if (!extension) if (!extension)
return nullptr; return nullptr;
CHECK_EQ(std::string(kExtensionId), extension->id()); EXPECT_EQ(std::string(extension_misc::kMimeHandlerPrivateTestExtensionId),
extension->id());
return extension; return extension;
} }
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h" #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h"
#include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h" #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h"
#include "extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.h" #include "extensions/browser/guest_view/mime_handler_view/test_mime_handler_view_guest.h"
#include "extensions/common/constants.h"
#include "extensions/test/result_catcher.h" #include "extensions/test/result_catcher.h"
#include "net/test/embedded_test_server/embedded_test_server.h" #include "net/test/embedded_test_server/embedded_test_server.h"
#include "third_party/blink/public/common/input/web_pointer_properties.h" #include "third_party/blink/public/common/input/web_pointer_properties.h"
...@@ -41,9 +42,6 @@ using guest_view::TestGuestViewManagerFactory; ...@@ -41,9 +42,6 @@ using guest_view::TestGuestViewManagerFactory;
namespace extensions { namespace extensions {
// The test extension id is set by the key value in the manifest.
const char kExtensionId[] = "oickdpebdnfbgkcaoklfcdhjniefkcji";
// Counts the number of URL requests made for a given URL. // Counts the number of URL requests made for a given URL.
class MimeHandlerViewTest : public ExtensionApiTest { class MimeHandlerViewTest : public ExtensionApiTest {
public: public:
...@@ -88,7 +86,8 @@ class MimeHandlerViewTest : public ExtensionApiTest { ...@@ -88,7 +86,8 @@ class MimeHandlerViewTest : public ExtensionApiTest {
if (!extension) if (!extension)
return nullptr; return nullptr;
CHECK_EQ(std::string(kExtensionId), extension->id()); EXPECT_EQ(std::string(extension_misc::kMimeHandlerPrivateTestExtensionId),
extension->id());
return extension; return extension;
} }
......
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