Rename a bunch of Mojo Application stuff to reference Services.

services/navigation/view_impl.cc

 // Copyright 2016 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 "services/navigation/view_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/interstitial_page.h"
@@ skipping 48 matching lines @@
 }  // namespace
 
 ViewImpl::ViewImpl(std::unique_ptr<shell::Connector> connector,
                    const std::string& client_user_id,
                    mojom::ViewClientPtr client,
                    std::unique_ptr<shell::ServiceContextRef> ref)
     : connector_(std::move(connector)),
       client_(std::move(client)),
       ref_(std::move(ref)),
       web_view_(new views::WebView(
-          content::BrowserContext::GetBrowserContextForShellUserId(
+          content::BrowserContext::GetBrowserContextForServiceUserId(
               client_user_id))) {
   web_view_->GetWebContents()->SetDelegate(this);
   const content::NavigationController* controller =
       &web_view_->GetWebContents()->GetController();
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                  content::Source<content::NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<content::NavigationController>(controller));
   registrar_.Add(this, content::NOTIFICATION_NAV_LIST_PRUNED,
                  content::Source<content::NavigationController>(controller));
@@ skipping 61 matching lines @@
                               bool user_gesture,
                               bool* was_blocked) {
   mojom::ViewClientPtr client;
   mojom::ViewPtr view;
   mojom::ViewRequest view_request = GetProxy(&view);
   client_->ViewCreated(std::move(view), GetProxy(&client),
                        disposition == WindowOpenDisposition::NEW_POPUP,
                        initial_rect, user_gesture);
 
   const std::string new_user_id =
-      content::BrowserContext::GetShellUserIdFor(
+      content::BrowserContext::GetServiceUserIdFor(
           new_contents->GetBrowserContext());
   auto impl = base::MakeUnique<ViewImpl>(connector_->Clone(), new_user_id,
                                          std::move(client), ref_->Clone());
 
   // TODO(beng): This is a bit crappy. should be able to create the ViewImpl
   //             with |new_contents| instead.
   impl->web_view_->SetWebContents(new_contents);
   impl->web_view_->GetWebContents()->SetDelegate(impl.get());
 
   // TODO(beng): this reply is currently synchronous, figure out a fix.
@@ skipping 137 matching lines @@
 
 views::Widget* ViewImpl::GetWidget() {
   return web_view_->GetWidget();
 }
 
 const views::Widget* ViewImpl::GetWidget() const {
   return web_view_->GetWidget();
 }
 
 }  // navigation