Merge 275988 "Move about://-related constants from //content to ..."

apps/launcher.cc

 // Copyright 2013 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 "apps/launcher.h"
 
 #include "apps/browser/api/app_runtime/app_runtime_api.h"
 #include "apps/browser/file_handler_util.h"
 #include "apps/common/api/app_runtime.h"
 #include "base/command_line.h"
@@ skipping 393 matching lines @@
     if (!in_kiosk_mode) {
       LOG(ERROR) << "App with 'kiosk_only' attribute must be run in "
           << " ChromeOS kiosk mode.";
       NOTREACHED();
       return;
     }
   }
 
 #if defined(OS_WIN)
   base::CommandLine::StringType about_blank_url(
-      base::ASCIIToWide(content::kAboutBlankURL));
+      base::ASCIIToWide(url::kAboutBlankURL));
 #else
-  base::CommandLine::StringType about_blank_url(content::kAboutBlankURL);
+  base::CommandLine::StringType about_blank_url(url::kAboutBlankURL);
 #endif
   CommandLine::StringVector args = command_line.GetArgs();
   // Browser tests will add about:blank to the command line. This should
   // never be interpreted as a file to open, as doing so with an app that
   // has write access will result in a file 'about' being created, which
   // causes problems on the bots.
   if (args.empty() || (command_line.HasSwitch(switches::kTestType) &&
                        args[0] == about_blank_url)) {
     LaunchPlatformAppWithNoData(profile, extension);
     return;
@@ skipping 56 matching lines @@
 void LaunchPlatformAppWithUrl(Profile* profile,
                               const Extension* extension,
                               const std::string& handler_id,
                               const GURL& url,
                               const GURL& referrer_url) {
   AppEventRouter::DispatchOnLaunchedEventWithUrl(
       profile, extension, handler_id, url, referrer_url);
 }
 
 }  // namespace apps