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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 368273011: Revert of Componentize TemplateURLService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/autocomplete/shortcuts_backend_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/autocomplete/search_provider.h" 5 #include "chrome/browser/autocomplete/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/autocomplete_match.h" 21 #include "chrome/browser/autocomplete/autocomplete_match.h"
22 #include "chrome/browser/autocomplete/autocomplete_provider.h" 22 #include "chrome/browser/autocomplete/autocomplete_provider.h"
23 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" 23 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
24 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 24 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
25 #include "chrome/browser/autocomplete/history_url_provider.h" 25 #include "chrome/browser/autocomplete/history_url_provider.h"
26 #include "chrome/browser/history/history_service.h" 26 #include "chrome/browser/history/history_service.h"
27 #include "chrome/browser/history/history_service_factory.h" 27 #include "chrome/browser/history/history_service_factory.h"
28 #include "chrome/browser/omnibox/omnibox_field_trial.h" 28 #include "chrome/browser/omnibox/omnibox_field_trial.h"
29 #include "chrome/browser/search_engines/template_url_service.h"
29 #include "chrome/browser/search_engines/template_url_service_factory.h" 30 #include "chrome/browser/search_engines/template_url_service_factory.h"
30 #include "chrome/browser/signin/signin_manager_factory.h" 31 #include "chrome/browser/signin/signin_manager_factory.h"
31 #include "chrome/browser/sync/profile_sync_service.h" 32 #include "chrome/browser/sync/profile_sync_service.h"
32 #include "chrome/browser/sync/profile_sync_service_factory.h" 33 #include "chrome/browser/sync/profile_sync_service_factory.h"
33 #include "chrome/common/chrome_switches.h" 34 #include "chrome/common/chrome_switches.h"
34 #include "chrome/common/pref_names.h" 35 #include "chrome/common/pref_names.h"
35 #include "chrome/test/base/testing_browser_process.h" 36 #include "chrome/test/base/testing_browser_process.h"
36 #include "chrome/test/base/testing_profile.h" 37 #include "chrome/test/base/testing_profile.h"
37 #include "components/autocomplete/autocomplete_input.h" 38 #include "components/autocomplete/autocomplete_input.h"
38 #include "components/google/core/browser/google_switches.h" 39 #include "components/google/core/browser/google_switches.h"
39 #include "components/metrics/proto/omnibox_event.pb.h" 40 #include "components/metrics/proto/omnibox_event.pb.h"
40 #include "components/search_engines/search_engine_type.h" 41 #include "components/search_engines/search_engine_type.h"
41 #include "components/search_engines/search_engines_switches.h" 42 #include "components/search_engines/search_engines_switches.h"
42 #include "components/search_engines/template_url.h" 43 #include "components/search_engines/template_url.h"
43 #include "components/search_engines/template_url_service.h"
44 #include "components/signin/core/browser/signin_manager.h" 44 #include "components/signin/core/browser/signin_manager.h"
45 #include "components/sync_driver/pref_names.h" 45 #include "components/sync_driver/pref_names.h"
46 #include "components/variations/entropy_provider.h" 46 #include "components/variations/entropy_provider.h"
47 #include "components/variations/variations_associated_data.h" 47 #include "components/variations/variations_associated_data.h"
48 #include "content/public/test/test_browser_thread_bundle.h" 48 #include "content/public/test/test_browser_thread_bundle.h"
49 #include "net/url_request/test_url_fetcher_factory.h" 49 #include "net/url_request/test_url_fetcher_factory.h"
50 #include "net/url_request/url_request_status.h" 50 #include "net/url_request/url_request_status.h"
51 #include "testing/gtest/include/gtest/gtest.h" 51 #include "testing/gtest/include/gtest/gtest.h"
52 52
53 using base::ASCIIToUTF16; 53 using base::ASCIIToUTF16;
(...skipping 3142 matching lines...) Expand 10 before | Expand all | Expand 10 after
3196 3196
3197 // The expiration time is always updated. 3197 // The expiration time is always updated.
3198 provider_->GetSessionToken(); 3198 provider_->GetSessionToken();
3199 base::TimeTicks expiration_time_1 = provider_->token_expiration_time_; 3199 base::TimeTicks expiration_time_1 = provider_->token_expiration_time_;
3200 base::PlatformThread::Sleep(kSmallDelta); 3200 base::PlatformThread::Sleep(kSmallDelta);
3201 provider_->GetSessionToken(); 3201 provider_->GetSessionToken();
3202 base::TimeTicks expiration_time_2 = provider_->token_expiration_time_; 3202 base::TimeTicks expiration_time_2 = provider_->token_expiration_time_;
3203 EXPECT_GT(expiration_time_2, expiration_time_1); 3203 EXPECT_GT(expiration_time_2, expiration_time_1);
3204 EXPECT_GE(expiration_time_2, expiration_time_1 + kSmallDelta); 3204 EXPECT_GE(expiration_time_2, expiration_time_1 + kSmallDelta);
3205 } 3205 }
OLDNEW
« no previous file with comments | « chrome/browser/autocomplete/search_provider.cc ('k') | chrome/browser/autocomplete/shortcuts_backend_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698