Rename MojoURLResolver to URLResolver

services/window_manager/window_manager_api_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/application_impl.h"
@@ skipping 160 matching lines @@
     return window_manager_observer_.get();
   }
 
   mojo::WindowManagerPtr window_manager_;
 
  private:
   // Overridden from testing::Test:
   void SetUp() override {
     test_helper_.reset(new mojo::shell::ShellTestHelper);
     test_helper_->Init();
-    test_helper_->AddCustomMapping(GURL("mojo:window_manager"),
-                                   GURL("mojo:core_window_manager"));
+    test_helper_->AddURLMapping(GURL("mojo:window_manager"),
+                                GURL("mojo:core_window_manager"));
     test_helper_->SetLoaderForURL(
         scoped_ptr<mojo::ApplicationLoader>(
             new TestApplicationLoader(base::Bind(
                 &WindowManagerApiTest::OnRootAdded, base::Unretained(this)))),
         GURL(kTestServiceURL));
     ConnectToWindowManager2();
   }
   void TearDown() override {}
 
   void ConnectToWindowManager2() {
@@ skipping 61 matching lines @@
   EXPECT_EQ(id, first_window);
 
   Id second_window = OpenWindow();
   window_manager_->ActivateWindow(second_window,
                                   base::Bind(&EmptyResultCallback));
   id = WaitForActiveWindowChange();
   EXPECT_EQ(id, second_window);
 }
 
 }  // namespace window_manager