Move shell interfaces into the shell.mojom namespace.

mojo/shell/package_manager/content_handler_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 54 matching lines @@
   const std::string mime_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TestFetcher);
 };
 
 void QuitClosure(bool* value) {
   *value = true;
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
-class TestContentHandler : public ContentHandler, public ApplicationDelegate {
+class TestContentHandler : public mojom::ContentHandler,
+                           public ApplicationDelegate {
  public:
   TestContentHandler(ApplicationConnection* connection,
-                     InterfaceRequest<ContentHandler> request)
+                     InterfaceRequest<mojom::ContentHandler> request)
       : binding_(this, std::move(request)) {}
 
   // ContentHandler:
   void StartApplication(
-      InterfaceRequest<Application> application_request,
+      InterfaceRequest<mojom::Application> application_request,
       URLResponsePtr response,
       const Callback<void()>& destruct_callback) override {
     apps_.push_back(new ApplicationImpl(this, std::move(application_request)));
     destruct_callback.Run();
   }
 
  private:
-  StrongBinding<ContentHandler> binding_;
+  StrongBinding<mojom::ContentHandler> binding_;
   ScopedVector<ApplicationImpl> apps_;
 
   DISALLOW_COPY_AND_ASSIGN(TestContentHandler);
 };
 
 class TestApplicationLoader : public ApplicationLoader,
                               public ApplicationDelegate,
-                              public InterfaceFactory<ContentHandler> {
+                              public InterfaceFactory<mojom::ContentHandler> {
  public:
   TestApplicationLoader() : num_loads_(0) {}
   ~TestApplicationLoader() override {}
 
   int num_loads() const { return num_loads_; }
   const GURL& last_requestor_url() const { return last_requestor_url_; }
 
  private:
   // ApplicationLoader implementation.
   void Load(const GURL& url,
-            InterfaceRequest<Application> application_request) override {
+            InterfaceRequest<mojom::Application> application_request) override {
     ++num_loads_;
     test_app_.reset(new ApplicationImpl(this, std::move(application_request)));
   }
 
   // ApplicationDelegate implementation.
   bool AcceptConnection(ApplicationConnection* connection) override {
-    connection->AddService<ContentHandler>(this);
+    connection->AddService<mojom::ContentHandler>(this);
     last_requestor_url_ = GURL(connection->GetRemoteApplicationURL());
     return true;
   }
-  // InterfaceFactory<ContentHandler> implementation.
+  // InterfaceFactory<mojom::ContentHandler> implementation.
   void Create(ApplicationConnection* connection,
-              InterfaceRequest<ContentHandler> request) override {
+              InterfaceRequest<mojom::ContentHandler> request) override {
     new TestContentHandler(connection, std::move(request));
   }
 
   scoped_ptr<ApplicationImpl> test_app_;
   int num_loads_;
   GURL last_requestor_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestApplicationLoader);
 };
 
@@ skipping 91 matching lines @@
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test:test"));
     params->set_connect_callback(
         [&content_handler_id, &run_loop](uint32_t, uint32_t t) {
       content_handler_id = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id);
+    EXPECT_NE(mojom::Shell::kInvalidApplicationID, content_handler_id);
   }
 
   uint32_t content_handler_id2;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test:test"));
     params->set_connect_callback(
         [&content_handler_id2, &run_loop](uint32_t, uint32_t t) {
       content_handler_id2 = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id2);
+    EXPECT_NE(mojom::Shell::kInvalidApplicationID, content_handler_id2);
   }
   EXPECT_EQ(content_handler_id, content_handler_id2);
 }
 
 TEST_F(ContentHandlerTest, DifferedContentHandlersGetDifferentIDs) {
   TestApplicationLoader* content_handler_loader = new TestApplicationLoader;
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader),
       content_handler_url_);
 
   uint32_t content_handler_id;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test:test"));
     params->set_connect_callback(
         [&content_handler_id, &run_loop](uint32_t, uint32_t t) {
       content_handler_id = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id);
+    EXPECT_NE(mojom::Shell::kInvalidApplicationID, content_handler_id);
   }
 
   const std::string mime_type2 = "test/mime-type2";
   const GURL content_handler_url2("http://test.content.handler2");
   test_package_manager_->set_mime_type(mime_type2);
   test_package_manager_->RegisterContentHandler(mime_type2,
                                                 content_handler_url2);
 
   TestApplicationLoader* content_handler_loader2 = new TestApplicationLoader;
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(content_handler_loader2),
       content_handler_url2);
 
   uint32_t content_handler_id2;
   {
     base::RunLoop run_loop;
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->set_source(Identity(requestor_url_));
     params->SetTargetURL(GURL("test2:test2"));
     params->set_connect_callback(
         [&content_handler_id2, &run_loop](uint32_t, uint32_t t) {
       content_handler_id2 = t;
       run_loop.Quit();
     });
     application_manager_->ConnectToApplication(std::move(params));
     run_loop.Run();
-    EXPECT_NE(Shell::kInvalidApplicationID, content_handler_id2);
+    EXPECT_NE(mojom::Shell::kInvalidApplicationID, content_handler_id2);
   }
   EXPECT_NE(content_handler_id, content_handler_id2);
 }
 
 TEST_F(ContentHandlerTest,
        ConnectWithNoContentHandlerGetsInvalidContentHandlerId) {
   application_manager_->SetLoaderForURL(
       scoped_ptr<ApplicationLoader>(new TestApplicationLoader),
       GURL("test:test"));
 
   uint32_t content_handler_id = 1u;
   scoped_ptr<ConnectToApplicationParams> params(
       new ConnectToApplicationParams);
   params->SetTargetURL(GURL("test:test"));
   params->set_connect_callback(
       [&content_handler_id](uint32_t, uint32_t t) { content_handler_id = t; });
   application_manager_->ConnectToApplication(std::move(params));
   EXPECT_EQ(0u, content_handler_id);
 }
 
 }  // namespace test
 }  // namespace package_manager
 }  // namespace mojo