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

Side by Side Diff: chrome/browser/ui/omnibox/omnibox_controller_unittest.cc

Issue 73613002: InstantExtended: remove old flags, add new flag for query extraction. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix typo Created 7 years, 1 month 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/prefs/pref_service.h" 5 #include "base/prefs/pref_service.h"
6 #include "chrome/browser/autocomplete/autocomplete_controller.h" 6 #include "chrome/browser/autocomplete/autocomplete_controller.h"
7 #include "chrome/browser/autocomplete/autocomplete_provider.h" 7 #include "chrome/browser/autocomplete/autocomplete_provider.h"
8 #include "chrome/browser/search/search.h"
9 #include "chrome/browser/ui/omnibox/omnibox_controller.h" 8 #include "chrome/browser/ui/omnibox/omnibox_controller.h"
10 #include "chrome/common/pref_names.h" 9 #include "chrome/common/pref_names.h"
11 #include "chrome/test/base/testing_profile.h" 10 #include "chrome/test/base/testing_profile.h"
12 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
13 12
14 class OmniboxControllerTest : public testing::Test { 13 class OmniboxControllerTest : public testing::Test {
15 protected: 14 protected:
16 OmniboxControllerTest(); 15 OmniboxControllerTest();
17 virtual ~OmniboxControllerTest(); 16 virtual ~OmniboxControllerTest();
18 17
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 const ACProviders* providers = GetAutocompleteProviders(); 65 const ACProviders* providers = GetAutocompleteProviders();
67 for (size_t i = 0; i < providers->size(); ++i) 66 for (size_t i = 0; i < providers->size(); ++i)
68 observed_providers |= providers->at(i)->type(); 67 observed_providers |= providers->at(i)->type();
69 // Ensure we have at least one provider. 68 // Ensure we have at least one provider.
70 ASSERT_NE(0, observed_providers); 69 ASSERT_NE(0, observed_providers);
71 70
72 // Ensure instant extended includes all the provides in classic Chrome. 71 // Ensure instant extended includes all the provides in classic Chrome.
73 int providers_with_instant_extended = observed_providers; 72 int providers_with_instant_extended = observed_providers;
74 // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass 73 // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass
75 // the Instant suggestion through via FinalizeInstantQuery. 74 // the Instant suggestion through via FinalizeInstantQuery.
76 chrome::EnableInstantExtendedAPIForTesting();
77 CreateController(); 75 CreateController();
78 AssertProviders(providers_with_instant_extended); 76 AssertProviders(providers_with_instant_extended);
79 } 77 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698