cros: Fix demo app could bring up CCD.

chrome/browser/chromeos/login/demo_mode/demo_app_launcher.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 "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"
@@ skipping 11 matching lines @@
 #include "chromeos/network/network_state_handler.h"
 #include "chromeos/network/shill_property_util.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "grit/browser_resources.h"
 #include "ui/base/window_open_disposition.h"
 
 namespace chromeos {
 
 const char DemoAppLauncher::kDemoUserName[] = "demouser@demo.app.local";
+const char DemoAppLauncher::kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel";
 const base::FilePath::CharType kDefaultDemoAppPath[] =
     FILE_PATH_LITERAL("/usr/share/chromeos-assets/demo_app");
 
 // static
 base::FilePath* DemoAppLauncher::demo_app_path_ = NULL;
 
 DemoAppLauncher::DemoAppLauncher() {
   if (!demo_app_path_)
     demo_app_path_ = new base::FilePath(kDefaultDemoAppPath);
 }
@@ skipping 36 matching lines @@
 
   const extensions::Extension* extension =
       extension_service->GetExtensionById(extension_id, true);
   if (!extension) {
     // We've already done too much setup at this point to just return out, it
     // is safer to just restart.
     chrome::AttemptUserExit();
     return;
   }
 
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  command_line->AppendSwitch(switches::kForceAppMode);
-  command_line->AppendSwitchASCII(switches::kAppId, extension_id);
-
   // Disable network before launching the app.
   LOG(WARNING) << "Disabling network before launching demo app..";
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   handler->SetTechnologyEnabled(NetworkTypePattern::NonVirtual(),
                                 false,
                                 chromeos::network_handler::ErrorCallback());
 
   OpenApplication(AppLaunchParams(
       profile, extension, extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
   InitAppSession(profile, extension_id);
 
   UserManager::Get()->SessionStarted();
 
   LoginDisplayHostImpl::default_host()->Finalize();
 }
 
 void DemoAppLauncher::OnProfileLoadFailed(KioskAppLaunchError::Error error) {
   LOG(ERROR) << "Loading the Kiosk Profile failed: " <<
       KioskAppLaunchError::GetErrorMessage(error);
 }
 
 }  // namespace chromeos