Re-order logic in StartPageService::HotwordEnabled().

chrome/browser/ui/app_list/start_page_service.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 "chrome/browser/ui/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 427 matching lines @@
       "appList.startPage.toggleSpeechRecognition");
 }
 
 bool StartPageService::HotwordEnabled() {
 // Voice input for the launcher is unsupported on non-ChromeOS platforms.
 // TODO(amistry): Make speech input, and hotwording, work on non-ChromeOS.
 #if defined(OS_CHROMEOS)
   if (HotwordService::IsExperimentalHotwordingEnabled()) {
     HotwordService* service = HotwordServiceFactory::GetForProfile(profile_);
     return state_ != SPEECH_RECOGNITION_OFF &&
-        HotwordServiceFactory::IsServiceAvailable(profile_) &&
         service &&
-        (service->IsSometimesOnEnabled() || service->IsAlwaysOnEnabled());
+        (service->IsSometimesOnEnabled() || service->IsAlwaysOnEnabled()) &&
+        service->IsServiceAvailable();
   }
   return HotwordServiceFactory::IsServiceAvailable(profile_) &&
       profile_->GetPrefs()->GetBoolean(prefs::kHotwordSearchEnabled);
 #else
   return false;
 #endif
 }
 
 content::WebContents* StartPageService::GetStartPageContents() {
   return app_list::switches::IsExperimentalAppListEnabled() ? contents_.get()
@@ skipping 215 matching lines @@
 
   // Check for a new doodle.
   content::BrowserThread::PostDelayedTask(
       content::BrowserThread::UI, FROM_HERE,
       base::Bind(&StartPageService::FetchDoodleJson,
                  weak_factory_.GetWeakPtr()),
       recheck_delay);
 }
 
 }  // namespace app_list