Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(221)

Side by Side Diff: chrome/browser/autocomplete/autocomplete_provider_unittest.cc

Issue 1143343005: chrome/browser: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/omnibox/autocomplete_provider.h" 5 #include "components/omnibox/autocomplete_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/location.h"
9 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
11 #include "base/single_thread_task_runner.h"
10 #include "base/strings/string16.h" 12 #include "base/strings/string16.h"
11 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
12 #include "base/strings/string_util.h" 14 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "base/thread_task_runner_handle.h"
14 #include "chrome/browser/autocomplete/autocomplete_controller.h" 17 #include "chrome/browser/autocomplete/autocomplete_controller.h"
15 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
16 #include "chrome/browser/chrome_notification_types.h" 19 #include "chrome/browser/chrome_notification_types.h"
17 #include "chrome/browser/search_engines/template_url_service_factory.h" 20 #include "chrome/browser/search_engines/template_url_service_factory.h"
18 #include "chrome/test/base/testing_browser_process.h" 21 #include "chrome/test/base/testing_browser_process.h"
19 #include "chrome/test/base/testing_profile.h" 22 #include "chrome/test/base/testing_profile.h"
20 #include "components/metrics/proto/omnibox_event.pb.h" 23 #include "components/metrics/proto/omnibox_event.pb.h"
21 #include "components/omnibox/autocomplete_input.h" 24 #include "components/omnibox/autocomplete_input.h"
22 #include "components/omnibox/autocomplete_match.h" 25 #include "components/omnibox/autocomplete_match.h"
23 #include "components/omnibox/autocomplete_provider_listener.h" 26 #include "components/omnibox/autocomplete_provider_listener.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("echo"))); 105 TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("echo")));
103 AddResultsWithSearchTermsArgs( 106 AddResultsWithSearchTermsArgs(
104 2, 1, AutocompleteMatchType::NAVSUGGEST, 107 2, 1, AutocompleteMatchType::NAVSUGGEST,
105 TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("nav"))); 108 TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("nav")));
106 AddResultsWithSearchTermsArgs( 109 AddResultsWithSearchTermsArgs(
107 3, 1, AutocompleteMatchType::SEARCH_SUGGEST, 110 3, 1, AutocompleteMatchType::SEARCH_SUGGEST,
108 TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("query"))); 111 TemplateURLRef::SearchTermsArgs(base::ASCIIToUTF16("query")));
109 112
110 if (input.want_asynchronous_matches()) { 113 if (input.want_asynchronous_matches()) {
111 done_ = false; 114 done_ = false;
112 base::MessageLoop::current()->PostTask( 115 base::ThreadTaskRunnerHandle::Get()->PostTask(
113 FROM_HERE, base::Bind(&TestProvider::Run, this)); 116 FROM_HERE, base::Bind(&TestProvider::Run, this));
114 } 117 }
115 } 118 }
116 119
117 void TestProvider::Run() { 120 void TestProvider::Run() {
118 DCHECK_GT(kResultsPerProvider, 0U); 121 DCHECK_GT(kResultsPerProvider, 0U);
119 AddResults(1, kResultsPerProvider); 122 AddResults(1, kResultsPerProvider);
120 done_ = true; 123 done_ = true;
121 DCHECK(listener_); 124 DCHECK(listener_);
122 listener_->OnProviderUpdate(true); 125 listener_->OnProviderUpdate(true);
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after
743 EXPECT_FALSE(search_provider_field_trial_triggered_in_session()); 746 EXPECT_FALSE(search_provider_field_trial_triggered_in_session());
744 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); 747 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
745 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path()); 748 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j0j4&", url.path());
746 749
747 // Test page classification and field trial triggered set. 750 // Test page classification and field trial triggered set.
748 set_search_provider_field_trial_triggered_in_session(true); 751 set_search_provider_field_trial_triggered_in_session(true);
749 EXPECT_TRUE(search_provider_field_trial_triggered_in_session()); 752 EXPECT_TRUE(search_provider_field_trial_triggered_in_session());
750 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456)); 753 url = GetDestinationURL(match, base::TimeDelta::FromMilliseconds(2456));
751 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path()); 754 EXPECT_EQ("//aqs=chrome.0.69i57j69i58j5l2j0l3j69i59.2456j1j4&", url.path());
752 } 755 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698