| Index: chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
|
| diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
|
| index 480db06463cf0269bdcba7e7bc040d18f46a10dc..37a8b17ae9268a81c75e8547f585ca3ca82347d4 100644
|
| --- a/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
|
| +++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider.cc
|
| @@ -8,7 +8,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/callback.h"
|
| -#include "base/metrics/field_trial.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/values.h"
|
| #include "chrome/browser/browser_process.h"
|
| @@ -29,13 +28,6 @@ const char kKeyId[] = "id";
|
| const char kKeyLocalizedName[] = "localized_name";
|
| const char kKeyIconUrl[] = "icon_url";
|
|
|
| -// Returns true if the launcher should send queries to the web store server.
|
| -bool UseWebstoreSearch() {
|
| - const char kFieldTrialName[] = "LauncherUseWebstoreSearch";
|
| - const char kEnable[] = "Enable";
|
| - return base::FieldTrialList::FindFullName(kFieldTrialName) == kEnable;
|
| -}
|
| -
|
| } // namespace
|
|
|
| WebstoreProvider::WebstoreProvider(Profile* profile,
|
| @@ -62,18 +54,16 @@ void WebstoreProvider::Start(const base::string16& query) {
|
| return;
|
| }
|
|
|
| - if (UseWebstoreSearch()) {
|
| - if (!webstore_search_) {
|
| - webstore_search_.reset(new JSONResponseFetcher(
|
| - base::Bind(&WebstoreProvider::OnWebstoreSearchFetched,
|
| - base::Unretained(this)),
|
| - profile_->GetRequestContext()));
|
| - }
|
| -
|
| - StartThrottledQuery(base::Bind(&WebstoreProvider::StartQuery,
|
| - base::Unretained(this)));
|
| + if (!webstore_search_) {
|
| + webstore_search_.reset(new JSONResponseFetcher(
|
| + base::Bind(&WebstoreProvider::OnWebstoreSearchFetched,
|
| + base::Unretained(this)),
|
| + profile_->GetRequestContext()));
|
| }
|
|
|
| + StartThrottledQuery(base::Bind(&WebstoreProvider::StartQuery,
|
| + base::Unretained(this)));
|
| +
|
| // Add a placeholder result which when clicked will run the user's query in a
|
| // browser. This placeholder is removed when the search results arrive.
|
| Add(scoped_ptr<SearchResult>(new SearchWebstoreResult(profile_, query_)));
|
|
|