Centralize command line checks for kEnableStreamlinedHostedApps.

chrome/browser/ui/ash/launcher/launcher_app_tab_helper.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 "chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h"
 
 #include <vector>
 
-#include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 
 namespace {
 
@@ skipping 20 matching lines @@
   }
 
   const GURL url = tab->GetURL();
   const extensions::ExtensionSet& extensions = registry->enabled_extensions();
   const extensions::Extension* extension = extensions.GetAppByURL(url);
   if (extension)
     return extension;
 
   // Bookmark app windows should match their launch url extension despite
   // their web extents.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnableStreamlinedHostedApps)) {
+  if (extensions::util::IsStreamlinedHostedAppsEnabled()) {
     for (extensions::ExtensionSet::const_iterator it = extensions.begin();
          it != extensions.end(); ++it) {
       if (it->get()->from_bookmark() &&
           extensions::AppLaunchInfo::GetLaunchWebURL(it->get()) == url) {
         return it->get();
       }
     }
   }
   return NULL;
 }
@@ skipping 34 matching lines @@
   return extension ? extension->id() : std::string();
 }
 
 bool LauncherAppTabHelper::IsValidIDForCurrentUser(const std::string& id) {
   return GetExtensionByID(profile_, id) != NULL;
 }
 
 void LauncherAppTabHelper::SetCurrentUser(Profile* profile) {
   profile_ = profile;
 }