Merge 161535 - Fix the spelling client not to use the spelling service yet. Also disabling some tes…

chrome/browser/spellchecker/spelling_service_client.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/spellchecker/spelling_service_client.h"
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/string_escape.h"
 #include "base/logging.h"
@@ skipping 93 matching lines @@
 }
 
 bool SpellingServiceClient::IsAvailable(Profile* profile, ServiceType type) {
   const PrefService* pref = profile->GetPrefs();
   if (!pref->GetBoolean(prefs::kEnableSpellCheck) ||
       !pref->GetBoolean(prefs::kSpellCheckUseSpellingService))
     return false;
 
   // The spellchecking service should be avilable only when asynchronous
   // spellchecking is enabled because this service depends on it.
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kDisableAsynchronousSpellChecking))
-    return type == SUGGEST;
 
   // Enable the suggest service only on languages not supported by the
   // spellcheck service. When this client calls the spellcheck service, it
   // returns not only spellcheck results but also spelling suggestions provided
   // by the suggest service. That is, it is not useful to use the suggest
   // service when this client can use the spellcheck service.
   std::string locale = pref->GetString(prefs::kSpellCheckDictionary);
+
+  // This means we are in a test.
+  if (locale.empty()) return false;
+
+  // Otherwise only suggest is currently valid.
+  return type == SUGGEST;
 #if defined(OS_MACOSX)
   bool spellcheck_available = locale.empty();
 #else
   bool spellcheck_available = locale.empty() || !locale.compare(0, 2, "en");
 #endif
   return type == SUGGEST ? !spellcheck_available : spellcheck_available;
 }
 
 void SpellingServiceClient::OnURLFetchComplete(
     const net::URLFetcher* source) {
@@ skipping 82 matching lines @@
     if (!suggestions->GetDictionary(0, &suggestion) ||
         !suggestion->GetString("suggestion", &replacement)) {
       return false;
     }
     SpellCheckResult result(
         SpellCheckResult::SPELLING, start, length, replacement);
     results->push_back(result);
   }
   return true;
 }