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

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

Issue 12546016: Remove the Extensions URLRequestContext (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: android webview init fix merged in. Created 7 years, 3 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
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" 8 #include "chrome/browser/search/search.h"
9 #include "chrome/browser/ui/omnibox/omnibox_controller.h" 9 #include "chrome/browser/ui/omnibox/omnibox_controller.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
11 #include "chrome/test/base/testing_profile.h" 11 #include "chrome/test/base/testing_profile.h"
12 #include "content/public/test/test_browser_thread_bundle.h"
12 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
13 14
14 class OmniboxControllerTest : public testing::Test { 15 class OmniboxControllerTest : public testing::Test {
15 protected: 16 protected:
16 OmniboxControllerTest(); 17 OmniboxControllerTest();
17 virtual ~OmniboxControllerTest(); 18 virtual ~OmniboxControllerTest();
18 19
19 void CreateController(); 20 void CreateController();
20 void AssertProviders(int expected_providers); 21 void AssertProviders(int expected_providers);
21 22
22 PrefService* GetPrefs() { return profile_.GetPrefs(); } 23 PrefService* GetPrefs() { return profile_.GetPrefs(); }
23 const ACProviders* GetAutocompleteProviders() const { 24 const ACProviders* GetAutocompleteProviders() const {
24 return omnibox_controller_->autocomplete_controller()->providers(); 25 return omnibox_controller_->autocomplete_controller()->providers();
25 } 26 }
26 27
27 private: 28 private:
29 content::TestBrowserThreadBundle thread_bundle_;
28 TestingProfile profile_; 30 TestingProfile profile_;
29 scoped_ptr<OmniboxController> omnibox_controller_; 31 scoped_ptr<OmniboxController> omnibox_controller_;
30 32
31 DISALLOW_COPY_AND_ASSIGN(OmniboxControllerTest); 33 DISALLOW_COPY_AND_ASSIGN(OmniboxControllerTest);
32 }; 34 };
33 35
34 OmniboxControllerTest::OmniboxControllerTest() { 36 OmniboxControllerTest::OmniboxControllerTest() {
35 } 37 }
36 38
37 OmniboxControllerTest::~OmniboxControllerTest() { 39 OmniboxControllerTest::~OmniboxControllerTest() {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 ASSERT_NE(0, observed_providers); 72 ASSERT_NE(0, observed_providers);
71 73
72 // Ensure instant extended includes all the provides in classic Chrome. 74 // Ensure instant extended includes all the provides in classic Chrome.
73 int providers_with_instant_extended = observed_providers; 75 int providers_with_instant_extended = observed_providers;
74 // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass 76 // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass
75 // the Instant suggestion through via FinalizeInstantQuery. 77 // the Instant suggestion through via FinalizeInstantQuery.
76 chrome::EnableInstantExtendedAPIForTesting(); 78 chrome::EnableInstantExtendedAPIForTesting();
77 CreateController(); 79 CreateController();
78 AssertProviders(providers_with_instant_extended); 80 AssertProviders(providers_with_instant_extended);
79 } 81 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/omnibox/omnibox_view_gtk_unittest.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698