Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / app_list / search / app_search_provider_unittest.cc

diff --git a/src/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/src/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
index ab44c2d..ace8123 100644 (file)
--- a/src/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
+++ b/src/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
@@ -11,7 +11,9 @@
 #include "chrome/browser/extensions/extension_service_unittest.h"
 #include "chrome/browser/ui/app_list/search/app_search_provider.h"
 #include "chrome/browser/ui/app_list/search/chrome_search_result.h"
+#include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_profile.h"
+#include "extensions/common/extension_set.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace app_list {
@@ -37,19 +39,19 @@ class AppSearchProviderTest : public ExtensionServiceTestBase {
         .AppendASCII("Extensions");
     base::FilePath pref_path = source_install_dir
         .DirName()
-        .AppendASCII("Preferences");
+        .Append(chrome::kPreferencesFilename);
     InitializeInstalledExtensionService(pref_path, source_install_dir);
     service_->Init();
 
     // There should be 4 extensions in the test profile.
-    const ExtensionSet* extensions = service_->extensions();
+    const extensions::ExtensionSet* extensions = service_->extensions();
     ASSERT_EQ(static_cast<size_t>(4),  extensions->size());
 
     app_search_.reset(new AppSearchProvider(profile_.get(), NULL));
   }
 
   std::string RunQuery(const std::string& query) {
-    app_search_->Start(UTF8ToUTF16(query));
+    app_search_->Start(base::UTF8ToUTF16(query));
     app_search_->Stop();
 
     std::string result_str;
@@ -58,7 +60,7 @@ class AppSearchProviderTest : public ExtensionServiceTestBase {
       if (!result_str.empty())
         result_str += ',';
 
-      result_str += UTF16ToUTF8(results[i]->title());
+      result_str += base::UTF16ToUTF8(results[i]->title());
     }
     return result_str;
   }