Patch 3.1: Refactored spellcheck_message_filter to be generic

chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc

Index: chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc
diff --git a/chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc b/chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc
deleted file mode 100644
index 4cab6d6bacc665329ff1d04192df0a4fe4505a7c..0000000000000000000000000000000000000000
--- a/chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (c) 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/spellchecker/spellcheck_message_filter_mac.h"
-
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/common/spellcheck_messages.h"
-#include "chrome/common/spellcheck_result.h"
-#include "content/public/browser/browser_thread.h"
-#include "ipc/ipc_message.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-TEST(SpellcheckMessageFilterMacTest, CombineResults) {
-  std::vector<SpellCheckResult> local_results;
-  std::vector<SpellCheckResult> remote_results;
-  base::string16 remote_suggestion = base::ASCIIToUTF16("remote");
-  base::string16 local_suggestion = base::ASCIIToUTF16("local");
-
-  // Remote-only result - must be flagged as GRAMMAR after combine
-  remote_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 0, 5));
-
-  // Local-only result - must be discarded after combine
-  local_results.push_back(
-      SpellCheckResult(SpellCheckResult::SPELLING, 10, 5));
-
-  // local & remote result - must be flagged SPELLING, uses remote suggestion.
-  SpellCheckResult result(SpellCheckResult::SPELLING, 20, 5, local_suggestion);
-  local_results.push_back(result);
-  result.replacement = remote_suggestion;
-  remote_results.push_back(result);
-
-  SpellCheckMessageFilterMac::CombineResults(&remote_results, local_results);
-
-  ASSERT_EQ(2U, remote_results.size());
-  EXPECT_EQ(SpellCheckResult::GRAMMAR, remote_results[0].decoration);
-  EXPECT_EQ(0, remote_results[0].location);
-  EXPECT_EQ(SpellCheckResult::SPELLING, remote_results[1].decoration);
-  EXPECT_EQ(20, remote_results[1].location);
-  EXPECT_EQ(remote_suggestion, remote_results[1].replacement);
-}
-
-TEST(SpellCheckMessageFilterMacTest, TestOverrideThread) {
-  static const uint32 kSpellcheckMessages[] = {
-    SpellCheckHostMsg_RequestTextCheck::ID,
-  };
-  scoped_refptr<SpellCheckMessageFilterMac> filter(
-      new SpellCheckMessageFilterMac(0));
-  content::BrowserThread::ID thread;
-  IPC::Message message;
-  for (size_t i = 0; i < arraysize(kSpellcheckMessages); ++i) {
-    message.SetHeaderValues(
-        0, kSpellcheckMessages[i], IPC::Message::PRIORITY_NORMAL);
-    thread = content::BrowserThread::IO;
-    filter->OverrideThreadForMessage(message, &thread);
-    EXPECT_EQ(content::BrowserThread::UI, thread);
-  }
-}
-
-}  // namespace

[please use gerrit instead, 2015/07/10 00:24:05]

Looks like you need to run "git rm
chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc" to get
rid of this file entirely. The code review website marked it as "M", which means
modified. It should be marked "D" instead.

[dylanking, 2015/07/10 02:21:22]

'git rm' does not recognize it as a file anymore:


dylanking@dylanking0:/usr/local/google/code/clankium/src$ git rm
chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc
fatal: pathspec
'chrome/browser/spellchecker/spellcheck_message_filter_mac_unittest.cc' did not
match any files