Change Mojo URLs to structured names

content/common/url_schemes.cc

 // Copyright (c) 2012 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 "content/common/url_schemes.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 18 matching lines @@
 
   GetContentClient()->AddAdditionalSchemes(&additional_standard_schemes,
                                            &additional_referrer_schemes,
                                            &additional_savable_schemes);
 
   url::AddStandardScheme(kChromeDevToolsScheme, url::SCHEME_WITHOUT_PORT);
   url::AddStandardScheme(kChromeUIScheme, url::SCHEME_WITHOUT_PORT);
   url::AddStandardScheme(kGuestScheme, url::SCHEME_WITHOUT_PORT);
   url::AddStandardScheme(kMetadataScheme, url::SCHEME_WITHOUT_AUTHORITY);
 
-  // TODO(rockot): Remove these. http://crbug.com/590012.
-  url::AddStandardScheme(kExeScheme, url::SCHEME_WITHOUT_AUTHORITY);
-  url::AddStandardScheme(kMojoScheme, url::SCHEME_WITHOUT_AUTHORITY);
-
   for (const url::SchemeWithType& scheme : additional_standard_schemes)
     url::AddStandardScheme(scheme.scheme, scheme.type);
 
   for (const url::SchemeWithType& scheme : additional_referrer_schemes)
     url::AddReferrerScheme(scheme.scheme, scheme.type);
 
   // Prevent future modification of the scheme lists. This is to prevent
   // accidental creation of data races in the program. Add*Scheme aren't
   // threadsafe so must be called when GURL isn't used on any other thread. This
   // is really easy to mess up, so we say that all calls to Add*Scheme in Chrome
@@ skipping 20 matching lines @@
       savable_schemes[default_schemes_count + i] =
           base::strdup(additional_savable_schemes[i].c_str());
     }
     savable_schemes[default_schemes_count + schemes] = 0;
 
     SetSavableSchemes(savable_schemes);
   }
 }
 
 }  // namespace content