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

Unified Diff: chrome/browser/prerender/prerender_browsertest.cc

Issue 797183005: Add a mimeHandler extension API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@streams-lifetime
Patch Set: rebase Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prerender/prerender_browsertest.cc
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc
index aa7447ebb40a0b46e8ac7989a209773161392fc1..beddbb362f2735431ed7d3a512db67e72fc9922d 100644
--- a/chrome/browser/prerender/prerender_browsertest.cc
+++ b/chrome/browser/prerender/prerender_browsertest.cc
@@ -60,8 +60,6 @@
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/extensions/extension_constants.h"
-#include "chrome/common/extensions/manifest_handlers/mime_types_handler.h"
#include "chrome/common/pref_names.h"
#include "chrome/grit/generated_resources.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -85,7 +83,9 @@
#include "content/public/test/browser_test_utils.h"
#include "content/public/test/test_navigation_observer.h"
#include "content/public/test/test_utils.h"
+#include "extensions/common/constants.h"
#include "extensions/common/extension_urls.h"
+#include "extensions/common/manifest_handlers/mime_types_handler.h"
#include "extensions/common/switches.h"
#include "extensions/test/result_catcher.h"
#include "net/base/escape.h"
@@ -3613,7 +3613,7 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTestWithExtensions, StreamsTest) {
const extensions::Extension* extension = LoadExtension(
test_data_dir_.AppendASCII("streams_private/handle_mime_type"));
ASSERT_TRUE(extension);
- EXPECT_EQ(std::string(extension_misc::kStreamsPrivateTestExtensionId),
+ EXPECT_EQ(std::string(extension_misc::kMimeHandlerPrivateTestExtensionId),
extension->id());
MimeTypesHandler* handler = MimeTypesHandler::GetHandler(extension);
ASSERT_TRUE(handler);

Powered by Google App Engine
This is Rietveld 408576698