cros: Fix demo app could bring up CCD.

chrome/browser/chromeos/login/demo_mode/demo_app_launcher_browsertest.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 "apps/app_window_registry.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 11 matching lines @@
 #include "chromeos/network/shill_property_util.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 
 namespace {
 
-char kDemoAppId[] = "klimoghijjogocdbaikffefjfcfheiel";
-
 base::FilePath GetTestDemoAppPath() {
   base::FilePath test_data_dir;
   EXPECT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
   return test_data_dir.Append(FILE_PATH_LITERAL("chromeos/demo_app"));
 }
 
 Profile* WaitForProfile() {
   chromeos::UserManager* user_manager = chromeos::UserManager::Get();
   if (!user_manager || !user_manager->IsUserLoggedIn()) {
     content::WindowedNotificationObserver(
         chrome::NOTIFICATION_SESSION_STARTED,
         content::NotificationService::AllSources()).Wait();
   }
 
   return ProfileManager::GetActiveUserProfile();
 }
 
 bool VerifyDemoAppLaunch() {
   Profile* profile = WaitForProfile();
   return AppWindowWaiter(apps::AppWindowRegistry::Get(profile),
-                         kDemoAppId).Wait() != NULL;
+                         DemoAppLauncher::kDemoAppId).Wait() != NULL;
 }
 
 bool VerifyNetworksDisabled() {
   NetworkStateHandler* handler = NetworkHandler::Get()->network_state_handler();
   return !handler->FirstNetworkByType(NetworkTypePattern::NonVirtual());
 }
 
 }  // namespace
 
 class DemoAppLauncherTest : public ExtensionBrowserTest {
@@ skipping 30 matching lines @@
   // did launch.
   EXPECT_TRUE(VerifyDemoAppLaunch());
 }
 
 IN_PROC_BROWSER_TEST_F(DemoAppLauncherTest, NoNetwork) {
   EXPECT_TRUE(VerifyDemoAppLaunch());
   EXPECT_TRUE(VerifyNetworksDisabled());
 }
 
 }  // namespace chromeos