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

chrome/browser/spellchecker/spelling_service_client_unittest.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 <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
@@ skipping 193 matching lines @@
 // Verifies that SpellingServiceClient::RequestTextCheck() creates a JSON
 // request sent to the Spelling service as we expect. This test also verifies
 // that it parses a JSON response from the service and calls the callback
 // function. To avoid sending JSON-RPC requests to the service, this test uses a
 // custom TestURLFecher class (TestSpellingURLFetcher) which calls
 // SpellingServiceClient::OnURLFetchComplete() with the parameters set by this
 // test. This test also uses a custom callback function that replaces all
 // misspelled words with ones suggested by the service so this test can compare
 // the corrected text with the expected results. (If there are not any
 // misspelled words, |corrected_text| should be equal to |request_text|.)
-TEST_F(SpellingServiceClientTest, RequestTextCheck) {
+TEST_F(SpellingServiceClientTest, DISABLED_RequestTextCheck) {
   static const struct {
     const char* request_text;
     SpellingServiceClient::ServiceType request_type;
     int response_status;
     const char* response_data;
     bool success;
     const char* corrected_text;
     const char* language;
   } kTests[] = {
     {
@@ skipping 86 matching lines @@
         kTests[i].request_type,
         ASCIIToUTF16(kTests[i].request_text),
         base::Bind(&SpellingServiceClientTest::OnTextCheckComplete,
                    base::Unretained(this)));
     client_.CallOnURLFetchComplete();
   }
 }
 
 // Verify that SpellingServiceClient::IsAvailable() returns true only when it
 // can send suggest requests or spellcheck requests.
-TEST_F(SpellingServiceClientTest, AvailableServices) {
+TEST_F(SpellingServiceClientTest, DISABLED_AvailableServices) {
   const SpellingServiceClient::ServiceType kSuggest =
       SpellingServiceClient::SUGGEST;
   const SpellingServiceClient::ServiceType kSpellcheck =
       SpellingServiceClient::SPELLCHECK;
 
   // When a user disables spellchecking or prevent using the Spelling service,
   // this function should return false both for suggestions and for spellcheck.
   PrefService* pref = profile_.GetPrefs();
   pref->SetBoolean(prefs::kEnableSpellCheck, false);
   pref->SetBoolean(prefs::kSpellCheckUseSpellingService, false);
@@ skipping 30 matching lines @@
     "it-IT", "lt-LT", "lv-LV", "nb-NO", "nl-NL", "pl-PL", "pt-BR", "pt-PT",
     "ro-RO", "ru-RU", "sk-SK", "sl-SI", "sh", "sr", "sv-SE", "tr-TR",
     "uk-UA", "vi-VN",
   };
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kUnsupported); ++i) {
     pref->SetString(prefs::kSpellCheckDictionary, kUnsupported[i]);
     EXPECT_TRUE(client_.IsAvailable(&profile_, kSuggest));
     EXPECT_FALSE(client_.IsAvailable(&profile_, kSpellcheck));
   }
 }