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

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

Issue 964563002: Replace SetAuthenticatedUsername with SetAuthenticatedAccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@priv
Patch Set: rebased Created 5 years, 8 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 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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/search_provider.h" 5 #include "components/omnibox/search_provider.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "base/run_loop.h" 12 #include "base/run_loop.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 19 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
20 #include "chrome/browser/autocomplete/autocomplete_controller.h" 20 #include "chrome/browser/autocomplete/autocomplete_controller.h"
21 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h" 21 #include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
22 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 22 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
23 #include "chrome/browser/autocomplete/history_url_provider.h" 23 #include "chrome/browser/autocomplete/history_url_provider.h"
24 #include "chrome/browser/history/history_service_factory.h" 24 #include "chrome/browser/history/history_service_factory.h"
25 #include "chrome/browser/search_engines/template_url_service_factory.h" 25 #include "chrome/browser/search_engines/template_url_service_factory.h"
26 #include "chrome/browser/signin/account_tracker_service_factory.h"
26 #include "chrome/browser/signin/signin_manager_factory.h" 27 #include "chrome/browser/signin/signin_manager_factory.h"
27 #include "chrome/browser/sync/profile_sync_service.h" 28 #include "chrome/browser/sync/profile_sync_service.h"
28 #include "chrome/browser/sync/profile_sync_service_factory.h" 29 #include "chrome/browser/sync/profile_sync_service_factory.h"
29 #include "chrome/common/chrome_switches.h" 30 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 31 #include "chrome/common/pref_names.h"
31 #include "chrome/test/base/testing_browser_process.h" 32 #include "chrome/test/base/testing_browser_process.h"
32 #include "chrome/test/base/testing_profile.h" 33 #include "chrome/test/base/testing_profile.h"
33 #include "components/google/core/browser/google_switches.h" 34 #include "components/google/core/browser/google_switches.h"
34 #include "components/history/core/browser/history_service.h" 35 #include "components/history/core/browser/history_service.h"
35 #include "components/metrics/proto/omnibox_event.pb.h" 36 #include "components/metrics/proto/omnibox_event.pb.h"
36 #include "components/omnibox/autocomplete_input.h" 37 #include "components/omnibox/autocomplete_input.h"
37 #include "components/omnibox/autocomplete_match.h" 38 #include "components/omnibox/autocomplete_match.h"
38 #include "components/omnibox/autocomplete_provider.h" 39 #include "components/omnibox/autocomplete_provider.h"
39 #include "components/omnibox/autocomplete_provider_listener.h" 40 #include "components/omnibox/autocomplete_provider_listener.h"
40 #include "components/omnibox/omnibox_field_trial.h" 41 #include "components/omnibox/omnibox_field_trial.h"
41 #include "components/omnibox/omnibox_switches.h" 42 #include "components/omnibox/omnibox_switches.h"
42 #include "components/omnibox/suggestion_answer.h" 43 #include "components/omnibox/suggestion_answer.h"
43 #include "components/search_engines/search_engine_type.h" 44 #include "components/search_engines/search_engine_type.h"
44 #include "components/search_engines/search_engines_switches.h" 45 #include "components/search_engines/search_engines_switches.h"
45 #include "components/search_engines/search_terms_data.h" 46 #include "components/search_engines/search_terms_data.h"
46 #include "components/search_engines/template_url.h" 47 #include "components/search_engines/template_url.h"
47 #include "components/search_engines/template_url_service.h" 48 #include "components/search_engines/template_url_service.h"
49 #include "components/signin/core/browser/account_tracker_service.h"
48 #include "components/signin/core/browser/signin_manager.h" 50 #include "components/signin/core/browser/signin_manager.h"
49 #include "components/sync_driver/pref_names.h" 51 #include "components/sync_driver/pref_names.h"
50 #include "components/variations/entropy_provider.h" 52 #include "components/variations/entropy_provider.h"
51 #include "components/variations/variations_associated_data.h" 53 #include "components/variations/variations_associated_data.h"
52 #include "content/public/test/test_browser_thread_bundle.h" 54 #include "content/public/test/test_browser_thread_bundle.h"
53 #include "net/url_request/test_url_fetcher_factory.h" 55 #include "net/url_request/test_url_fetcher_factory.h"
54 #include "net/url_request/url_request_status.h" 56 #include "net/url_request/url_request_status.h"
55 #include "testing/gtest/include/gtest/gtest.h" 57 #include "testing/gtest/include/gtest/gtest.h"
56 58
57 using base::ASCIIToUTF16; 59 using base::ASCIIToUTF16;
(...skipping 3177 matching lines...) Expand 10 before | Expand all | Expand 10 after
3235 CreateFieldTrial(OmniboxFieldTrial::kZeroSuggestRule, true); 3237 CreateFieldTrial(OmniboxFieldTrial::kZeroSuggestRule, true);
3236 3238
3237 ChromeAutocompleteProviderClient client(&profile_); 3239 ChromeAutocompleteProviderClient client(&profile_);
3238 3240
3239 // Not signed in. 3241 // Not signed in.
3240 EXPECT_FALSE(SearchProvider::CanSendURL( 3242 EXPECT_FALSE(SearchProvider::CanSendURL(
3241 GURL("http://www.google.com/search"), 3243 GURL("http://www.google.com/search"),
3242 GURL("https://www.google.com/complete/search"), &google_template_url, 3244 GURL("https://www.google.com/complete/search"), &google_template_url,
3243 metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client)); 3245 metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
3244 SigninManagerBase* signin = SigninManagerFactory::GetForProfile(&profile_); 3246 SigninManagerBase* signin = SigninManagerFactory::GetForProfile(&profile_);
3245 signin->SetAuthenticatedUsername("test"); 3247 signin->SetAuthenticatedAccountInfo("gaia_id", "test");
3246 3248
3247 // All conditions should be met. 3249 // All conditions should be met.
3248 EXPECT_TRUE(SearchProvider::CanSendURL( 3250 EXPECT_TRUE(SearchProvider::CanSendURL(
3249 GURL("http://www.google.com/search"), 3251 GURL("http://www.google.com/search"),
3250 GURL("https://www.google.com/complete/search"), &google_template_url, 3252 GURL("https://www.google.com/complete/search"), &google_template_url,
3251 metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client)); 3253 metrics::OmniboxEventProto::OTHER, SearchTermsData(), &client));
3252 3254
3253 // Not in field trial. 3255 // Not in field trial.
3254 ResetFieldTrialList(); 3256 ResetFieldTrialList();
3255 CreateFieldTrial(OmniboxFieldTrial::kZeroSuggestRule, false); 3257 CreateFieldTrial(OmniboxFieldTrial::kZeroSuggestRule, false);
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
3590 3592
3591 TEST_F(SearchProviderTest, DoesNotProvideOnFocus) { 3593 TEST_F(SearchProviderTest, DoesNotProvideOnFocus) {
3592 AutocompleteInput input(base::ASCIIToUTF16("f"), base::string16::npos, 3594 AutocompleteInput input(base::ASCIIToUTF16("f"), base::string16::npos,
3593 std::string(), GURL(), 3595 std::string(), GURL(),
3594 metrics::OmniboxEventProto::INVALID_SPEC, false, 3596 metrics::OmniboxEventProto::INVALID_SPEC, false,
3595 true, true, true, 3597 true, true, true,
3596 ChromeAutocompleteSchemeClassifier(&profile_)); 3598 ChromeAutocompleteSchemeClassifier(&profile_));
3597 provider_->Start(input, false, true); 3599 provider_->Start(input, false, true);
3598 EXPECT_TRUE(provider_->matches().empty()); 3600 EXPECT_TRUE(provider_->matches().empty());
3599 } 3601 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698