Move more of ContentHandler handling into PackageManager.

mojo/shell/test_package_manager.cc

Index: mojo/shell/test_package_manager.cc
diff --git a/mojo/shell/test_package_manager.cc b/mojo/shell/test_package_manager.cc
index d5cdd8a1d52efe642199459d10ca11a9cd56d52e..c36d7e12e3eaff079a904150c2bf09158dccffc8 100644
--- a/mojo/shell/test_package_manager.cc
+++ b/mojo/shell/test_package_manager.cc
@@ -4,47 +4,26 @@
 
 #include "mojo/shell/test_package_manager.h"
 
-#include "base/logging.h"
-#include "mojo/shell/fetcher.h"
-#include "url/gurl.h"
-
 namespace mojo {
 namespace shell {
+namespace test {
 
 TestPackageManager::TestPackageManager() {}
 TestPackageManager::~TestPackageManager() {}
 
-void TestPackageManager::RegisterContentHandler(
-    const std::string& mime_type,
-    const GURL& content_handler_url) {
-  DCHECK(content_handler_url.is_valid())
-      << "Content handler URL is invalid for mime type " << mime_type;
-  mime_type_to_url_[mime_type] = content_handler_url;
-}
-
-void TestPackageManager::SetApplicationManager(ApplicationManager* manager) {
-}
-
+void TestPackageManager::SetApplicationManager(ApplicationManager* manager) {}
 void TestPackageManager::FetchRequest(
     URLRequestPtr request,
     const Fetcher::FetchCallback& loader_callback) {}
-
-bool TestPackageManager::HandleWithContentHandler(
+uint32_t TestPackageManager::HandleWithContentHandler(
     Fetcher* fetcher,
-    const GURL& url,
-    base::TaskRunner* task_runner,
-    URLResponsePtr* new_response,
-    GURL* content_handler_url,
-    std::string* qualifier) {
-  MimeTypeToURLMap::iterator iter = mime_type_to_url_.find(fetcher->MimeType());
-  if (iter != mime_type_to_url_.end()) {
-    *new_response = fetcher->AsURLResponse(task_runner, 0);
-    *content_handler_url = iter->second;
-    *qualifier = (*new_response)->site.To<std::string>();
-    return true;
-  }
-  return false;
+    const Identity& source,
+    const GURL& target_url,
+    const CapabilityFilter& target_filter,
+    InterfaceRequest<Application>* application_request) {
+  return 0;
 }
 
+}  // namespace test
 }  // namespace shell
 }  // namespace mojo