From 1a85132a517b83b9b16c9433a0a65fc54b6ee5ec Mon Sep 17 00:00:00 2001 From: mukai Date: Tue, 2 Sep 2014 13:34:44 -0700 Subject: [PATCH] Move basic string operations to ui/app_list/search BUG=380875 R=xiyuan@chromium.org TEST=build succeeds Review URL: https://codereview.chromium.org/522683003 Cr-Commit-Position: refs/heads/master@{#292990} --- chrome/browser/ui/app_list/search/app_result.cc | 4 ++-- .../ui/app_list/search/app_search_provider.cc | 4 ++-- chrome/browser/ui/app_list/search/history.cc | 2 +- chrome/chrome_browser_ui.gypi | 8 -------- chrome/chrome_tests_unit.gypi | 4 ---- ui/app_list/BUILD.gn | 15 ++++++++++++++- ui/app_list/app_list.gyp | 13 +++++++++++++ .../app_list/search/term_break_iterator.cc | 2 +- .../app_list/search/term_break_iterator.h | 9 +++++---- .../search/term_break_iterator_unittest.cc | 2 +- .../ui => ui}/app_list/search/tokenized_string.cc | 4 ++-- .../ui => ui}/app_list/search/tokenized_string.h | 9 +++++---- .../search/tokenized_string_char_iterator.cc | 2 +- .../search/tokenized_string_char_iterator.h | 11 ++++++----- .../tokenized_string_char_iterator_unittest.cc | 2 +- .../app_list/search/tokenized_string_match.cc | 4 ++-- .../app_list/search/tokenized_string_match.h | 9 +++++---- .../search/tokenized_string_match_unittest.cc | 3 ++- .../app_list/search/tokenized_string_unittest.cc | 2 +- 19 files changed, 64 insertions(+), 45 deletions(-) rename {chrome/browser/ui => ui}/app_list/search/term_break_iterator.cc (96%) rename {chrome/browser/ui => ui}/app_list/search/term_break_iterator.h (87%) rename {chrome/browser/ui => ui}/app_list/search/term_break_iterator_unittest.cc (97%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string.cc (90%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string.h (83%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_char_iterator.cc (96%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_char_iterator.h (84%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_char_iterator_unittest.cc (98%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_match.cc (98%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_match.h (86%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_match_unittest.cc (98%) rename {chrome/browser/ui => ui}/app_list/search/tokenized_string_unittest.cc (97%) diff --git a/chrome/browser/ui/app_list/search/app_result.cc b/chrome/browser/ui/app_list/search/app_result.cc index f3a0b13c8d4e5f..92c68fd2847494 100644 --- a/chrome/browser/ui/app_list/search/app_result.cc +++ b/chrome/browser/ui/app_list/search/app_result.cc @@ -10,8 +10,6 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/app_context_menu.h" #include "chrome/browser/ui/app_list/app_list_controller_delegate.h" -#include "chrome/browser/ui/app_list/search/tokenized_string.h" -#include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "chrome/browser/ui/extensions/extension_enable_flow.h" #include "chrome/browser/ui/webui/ntp/core_app_launcher_handler.h" #include "content/public/browser/user_metrics.h" @@ -24,6 +22,8 @@ #include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest_handlers/icons_handler.h" #include "ui/app_list/app_list_switches.h" +#include "ui/app_list/search/tokenized_string.h" +#include "ui/app_list/search/tokenized_string_match.h" #include "ui/gfx/color_utils.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/chrome/browser/ui/app_list/search/app_search_provider.cc b/chrome/browser/ui/app_list/search/app_search_provider.cc index 87fd8ad78aed67..b7924fd15a5969 100644 --- a/chrome/browser/ui/app_list/search/app_search_provider.cc +++ b/chrome/browser/ui/app_list/search/app_search_provider.cc @@ -12,13 +12,13 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/app_list/search/app_result.h" -#include "chrome/browser/ui/app_list/search/tokenized_string.h" -#include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" +#include "ui/app_list/search/tokenized_string.h" +#include "ui/app_list/search/tokenized_string_match.h" using extensions::ExtensionRegistry; diff --git a/chrome/browser/ui/app_list/search/history.cc b/chrome/browser/ui/app_list/search/history.cc index 534fda7249fe21..195a10daf14acc 100644 --- a/chrome/browser/ui/app_list/search/history.cc +++ b/chrome/browser/ui/app_list/search/history.cc @@ -9,8 +9,8 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/app_list/search/history_data.h" #include "chrome/browser/ui/app_list/search/history_data_store.h" -#include "chrome/browser/ui/app_list/search/tokenized_string.h" #include "content/public/browser/browser_context.h" +#include "ui/app_list/search/tokenized_string.h" namespace app_list { diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi index c64d05fe746fd5..51e98da636e822 100644 --- a/chrome/chrome_browser_ui.gypi +++ b/chrome/chrome_browser_ui.gypi @@ -1232,14 +1232,6 @@ 'browser/ui/app_list/search/search_controller.h', 'browser/ui/app_list/search/search_webstore_result.cc', 'browser/ui/app_list/search/search_webstore_result.h', - 'browser/ui/app_list/search/term_break_iterator.cc', - 'browser/ui/app_list/search/term_break_iterator.h', - 'browser/ui/app_list/search/tokenized_string.cc', - 'browser/ui/app_list/search/tokenized_string.h', - 'browser/ui/app_list/search/tokenized_string_char_iterator.cc', - 'browser/ui/app_list/search/tokenized_string_char_iterator.h', - 'browser/ui/app_list/search/tokenized_string_match.cc', - 'browser/ui/app_list/search/tokenized_string_match.h', 'browser/ui/app_list/search/webstore/webstore_installer.cc', 'browser/ui/app_list/search/webstore/webstore_installer.h', 'browser/ui/app_list/search/webstore/webstore_provider.cc', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 55b30f759ca12d..db064057673169 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -2122,10 +2122,6 @@ 'browser/ui/app_list/search/history_unittest.cc', 'browser/ui/app_list/search/history_data_store_unittest.cc', 'browser/ui/app_list/search/mixer_unittest.cc', - 'browser/ui/app_list/search/term_break_iterator_unittest.cc', - 'browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc', - 'browser/ui/app_list/search/tokenized_string_match_unittest.cc', - 'browser/ui/app_list/search/tokenized_string_unittest.cc', ], 'dependencies': [ '../ash/ash.gyp:ash_test_support', diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn index c4c1651e6d8f50..dee6a85cfeae1b 100644 --- a/ui/app_list/BUILD.gn +++ b/ui/app_list/BUILD.gn @@ -38,6 +38,14 @@ component("app_list") { "search_provider.h", "search_result.cc", "search_result.h", + "search/term_break_iterator.cc", + "search/term_break_iterator.h", + "search/tokenized_string.cc", + "search/tokenized_string.h", + "search/tokenized_string_char_iterator.cc", + "search/tokenized_string_char_iterator.h", + "search/tokenized_string_match.cc", + "search/tokenized_string_match.h", "speech_ui_model.cc", "speech_ui_model.h", "speech_ui_model_observer.h", @@ -50,6 +58,7 @@ component("app_list") { "//base:i18n", "//base/third_party/dynamic_annotations", "//skia", + "//third_party/icu", "//ui/accessibility", "//ui/base", "//ui/compositor", @@ -158,7 +167,7 @@ component("app_list") { "cocoa/scroll_view_with_no_scrollbars.mm", ] deps += [ - #'../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac', TODO(GYP) + #"../../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac", TODO(GYP) ] libs = [ "QuartzCore.framework" ] } @@ -186,6 +195,10 @@ test("app_list_unittests") { "app_list_item_list_unittest.cc", "app_list_model_unittest.cc", "pagination_model_unittest.cc", + "search/term_break_iterator_unittest.cc", + "search/tokenized_string_char_iterator_unittest.cc", + "search/tokenized_string_match_unittest.cc", + "search/tokenized_string_unittest.cc", "test/run_all_unittests.cc", ] diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index 1b700b054114ad..39675a8fb72ad9 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -23,6 +23,7 @@ '../gfx/gfx.gyp:gfx_geometry', '../resources/ui_resources.gyp:ui_resources', '../strings/ui_strings.gyp:ui_strings', + '../../third_party/icu/icu.gyp:icuuc', ], 'defines': [ 'APP_LIST_IMPLEMENTATION', @@ -84,6 +85,14 @@ 'search_provider.h', 'search_result.cc', 'search_result.h', + 'search/term_break_iterator.cc', + 'search/term_break_iterator.h', + 'search/tokenized_string.cc', + 'search/tokenized_string.h', + 'search/tokenized_string_char_iterator.cc', + 'search/tokenized_string_char_iterator.h', + 'search/tokenized_string_match.cc', + 'search/tokenized_string_match.h', 'speech_ui_model.cc', 'speech_ui_model.h', 'speech_ui_model_observer.h', @@ -225,6 +234,10 @@ 'cocoa/apps_search_results_controller_unittest.mm', 'cocoa/test/apps_grid_controller_test_helper.h', 'cocoa/test/apps_grid_controller_test_helper.mm', + 'search/term_break_iterator_unittest.cc', + 'search/tokenized_string_char_iterator_unittest.cc', + 'search/tokenized_string_match_unittest.cc', + 'search/tokenized_string_unittest.cc', 'test/run_all_unittests.cc', 'views/app_list_main_view_unittest.cc', 'views/app_list_view_unittest.cc', diff --git a/chrome/browser/ui/app_list/search/term_break_iterator.cc b/ui/app_list/search/term_break_iterator.cc similarity index 96% rename from chrome/browser/ui/app_list/search/term_break_iterator.cc rename to ui/app_list/search/term_break_iterator.cc index 5ace7dcc7733cd..54a1c366630c2e 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator.cc +++ b/ui/app_list/search/term_break_iterator.cc @@ -2,7 +2,7 @@ // 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/search/term_break_iterator.h" +#include "ui/app_list/search/term_break_iterator.h" #include "base/i18n/char_iterator.h" #include "base/logging.h" diff --git a/chrome/browser/ui/app_list/search/term_break_iterator.h b/ui/app_list/search/term_break_iterator.h similarity index 87% rename from chrome/browser/ui/app_list/search/term_break_iterator.h rename to ui/app_list/search/term_break_iterator.h index 303d0e3193b390..ba9040bc2a5d20 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator.h +++ b/ui/app_list/search/term_break_iterator.h @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ -#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ +#ifndef UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ +#define UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" +#include "ui/app_list/app_list_export.h" namespace base { namespace i18n { @@ -23,7 +24,7 @@ namespace app_list { // e.g. // CamelCase -> Camel, Case // Python2.7 -> Python, 2.7 -class TermBreakIterator { +class APP_LIST_EXPORT TermBreakIterator { public: // Note that |word| must out live this iterator. explicit TermBreakIterator(const base::string16& word); @@ -66,4 +67,4 @@ class TermBreakIterator { } // namespace app_list -#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ +#endif // UI_APP_LIST_SEARCH_TERM_BREAK_ITERATOR_H_ diff --git a/chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc b/ui/app_list/search/term_break_iterator_unittest.cc similarity index 97% rename from chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc rename to ui/app_list/search/term_break_iterator_unittest.cc index cedf24b0ecb2e9..f9c586f74bb182 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator_unittest.cc +++ b/ui/app_list/search/term_break_iterator_unittest.cc @@ -2,7 +2,7 @@ // 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/search/term_break_iterator.h" +#include "ui/app_list/search/term_break_iterator.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/app_list/search/tokenized_string.cc b/ui/app_list/search/tokenized_string.cc similarity index 90% rename from chrome/browser/ui/app_list/search/tokenized_string.cc rename to ui/app_list/search/tokenized_string.cc index fc857fbbd9d974..5348f77cc54fe5 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string.cc +++ b/ui/app_list/search/tokenized_string.cc @@ -2,12 +2,12 @@ // 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/search/tokenized_string.h" +#include "ui/app_list/search/tokenized_string.h" #include "base/i18n/break_iterator.h" #include "base/i18n/case_conversion.h" #include "base/logging.h" -#include "chrome/browser/ui/app_list/search/term_break_iterator.h" +#include "ui/app_list/search/term_break_iterator.h" using base::i18n::BreakIterator; diff --git a/chrome/browser/ui/app_list/search/tokenized_string.h b/ui/app_list/search/tokenized_string.h similarity index 83% rename from chrome/browser/ui/app_list/search/tokenized_string.h rename to ui/app_list/search/tokenized_string.h index abc2ec2548a95e..1af03f6202fec4 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string.h +++ b/ui/app_list/search/tokenized_string.h @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_ -#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_ +#ifndef UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_ +#define UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_ #include #include "base/basictypes.h" #include "base/strings/string16.h" +#include "ui/app_list/app_list_export.h" #include "ui/gfx/range/range.h" namespace app_list { @@ -16,7 +17,7 @@ namespace app_list { // TokenizedString takes a string and breaks it down into token words. It // first breaks using BreakIterator to get all the words. Then it breaks // the words again at camel case boundaries and alpha/number boundaries. -class TokenizedString { +class APP_LIST_EXPORT TokenizedString { public: typedef std::vector Tokens; typedef std::vector Mappings; @@ -43,4 +44,4 @@ class TokenizedString { } // namespace app_list -#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_ +#endif // UI_APP_LIST_SEARCH_TOKENIZED_STRING_H_ diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc b/ui/app_list/search/tokenized_string_char_iterator.cc similarity index 96% rename from chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc rename to ui/app_list/search/tokenized_string_char_iterator.cc index 744dcaac5c320e..bdd75a3e30c3dd 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.cc +++ b/ui/app_list/search/tokenized_string_char_iterator.cc @@ -2,7 +2,7 @@ // 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/search/tokenized_string_char_iterator.h" +#include "ui/app_list/search/tokenized_string_char_iterator.h" #include "base/i18n/char_iterator.h" #include "base/logging.h" diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h b/ui/app_list/search/tokenized_string_char_iterator.h similarity index 84% rename from chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h rename to ui/app_list/search/tokenized_string_char_iterator.h index a77ee73b6f7327..72b5fdf3b527ea 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h +++ b/ui/app_list/search/tokenized_string_char_iterator.h @@ -2,12 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_ -#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_ +#ifndef UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_ +#define UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_ #include "base/basictypes.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/ui/app_list/search/tokenized_string.h" +#include "ui/app_list/app_list_export.h" +#include "ui/app_list/search/tokenized_string.h" namespace base { namespace i18n { @@ -18,7 +19,7 @@ class UTF16CharIterator; namespace app_list { // An UTF16 char iterator for a TokenizedString. -class TokenizedStringCharIterator { +class APP_LIST_EXPORT TokenizedStringCharIterator { public: struct State { State(); @@ -73,4 +74,4 @@ class TokenizedStringCharIterator { } // namespace app_list -#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_ +#endif // UI_APP_LIST_SEARCH_TOKENIZED_STRING_CHAR_ITERATOR_H_ diff --git a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc b/ui/app_list/search/tokenized_string_char_iterator_unittest.cc similarity index 98% rename from chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc rename to ui/app_list/search/tokenized_string_char_iterator_unittest.cc index 3ffef9b233e9b7..38460145e01693 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_char_iterator_unittest.cc +++ b/ui/app_list/search/tokenized_string_char_iterator_unittest.cc @@ -2,7 +2,7 @@ // 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/search/tokenized_string_char_iterator.h" +#include "ui/app_list/search/tokenized_string_char_iterator.h" #include #include diff --git a/chrome/browser/ui/app_list/search/tokenized_string_match.cc b/ui/app_list/search/tokenized_string_match.cc similarity index 98% rename from chrome/browser/ui/app_list/search/tokenized_string_match.cc rename to ui/app_list/search/tokenized_string_match.cc index e63a6d92eac5b8..e94f0ebef0f186 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_match.cc +++ b/ui/app_list/search/tokenized_string_match.cc @@ -2,11 +2,11 @@ // 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/search/tokenized_string_match.h" +#include "ui/app_list/search/tokenized_string_match.h" #include "base/i18n/string_search.h" #include "base/logging.h" -#include "chrome/browser/ui/app_list/search/tokenized_string_char_iterator.h" +#include "ui/app_list/search/tokenized_string_char_iterator.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/tokenized_string_match.h b/ui/app_list/search/tokenized_string_match.h similarity index 86% rename from chrome/browser/ui/app_list/search/tokenized_string_match.h rename to ui/app_list/search/tokenized_string_match.h index 3c9ceb8ea6109b..e00425a6e1d211 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_match.h +++ b/ui/app_list/search/tokenized_string_match.h @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_ -#define CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_ +#ifndef UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_ +#define UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_ #include #include "base/basictypes.h" #include "base/strings/string16.h" +#include "ui/app_list/app_list_export.h" #include "ui/gfx/range/range.h" namespace app_list { @@ -21,7 +22,7 @@ class TokenizedString; // of text. A relevance of zero means the two are completely different to each // other. The higher the relevance score, the better the two strings are // matched. Matched portions of text are stored as index ranges. -class TokenizedStringMatch { +class APP_LIST_EXPORT TokenizedStringMatch { public: typedef std::vector Hits; @@ -50,4 +51,4 @@ class TokenizedStringMatch { } // namespace app_list -#endif // CHROME_BROWSER_UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_ +#endif // UI_APP_LIST_SEARCH_TOKENIZED_STRING_MATCH_H_ diff --git a/chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc b/ui/app_list/search/tokenized_string_match_unittest.cc similarity index 98% rename from chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc rename to ui/app_list/search/tokenized_string_match_unittest.cc index d9c8a8ec3a46f3..d467b9d06406db 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_match_unittest.cc +++ b/ui/app_list/search/tokenized_string_match_unittest.cc @@ -2,11 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "ui/app_list/search/tokenized_string_match.h" + #include #include "base/basictypes.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/ui/app_list/search/tokenized_string_match.h" #include "testing/gtest/include/gtest/gtest.h" namespace app_list { diff --git a/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc b/ui/app_list/search/tokenized_string_unittest.cc similarity index 97% rename from chrome/browser/ui/app_list/search/tokenized_string_unittest.cc rename to ui/app_list/search/tokenized_string_unittest.cc index d5706a144f147c..64fb8eee4de80f 100644 --- a/chrome/browser/ui/app_list/search/tokenized_string_unittest.cc +++ b/ui/app_list/search/tokenized_string_unittest.cc @@ -2,7 +2,7 @@ // 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/search/tokenized_string.h" +#include "ui/app_list/search/tokenized_string.h" #include "base/strings/utf_string_conversions.h" #include "testing/gtest/include/gtest/gtest.h"