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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/autocomplete/builtin_provider_unittest.cc

Issue 1522303005: Componentize builtin_provider_unittest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updated Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/autocomplete/builtin_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc
index 988c2c6341286317f8418259bd00226cf62e5fae..1ccd6baef636bf607da8fb5fdc6382d7940a02e3 100644
--- a/chrome/browser/autocomplete/builtin_provider_unittest.cc
+++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc
@@ -11,20 +11,82 @@
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
-#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
-#include "chrome/common/url_constants.h"
-#include "chrome/test/base/testing_profile.h"
#include "components/metrics/proto/omnibox_event.pb.h"
#include "components/omnibox/browser/autocomplete_input.h"
#include "components/omnibox/browser/autocomplete_match.h"
#include "components/omnibox/browser/autocomplete_provider.h"
+#include "components/omnibox/browser/mock_autocomplete_provider_client.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
using base::ASCIIToUTF16;
+namespace {
+const char kChromeUIChromeURLsURL[] = "chrome://chrome-urls/";
+const char kChromeUIVersionURL[] = "chrome://version/";
+const char kChromeUISettingsURL[] = "chrome://settings/";
+const char kChromeUIScheme[] = "chrome";
+const char kChromeUIMediaInternalsHost[] = "media-internals";
+const char kChromeUIMemoryHost[] = "memory";
+const char kChromeUIMemoryInternalsHost[] = "memory-internals";
+const char kChromeUIBlobInternalsHost[] = "blob-internals";
+const char kAutofillSubPage[] = "autofill";
+const char kClearBrowserDataSubPage[] = "clearBrowserData";
+const char kSearchEnginesSubPage[] = "searchEngines";
+const char kSyncSetupSubPage[] = "syncSetup";
droger 2016/01/13 09:44:42 We need to get rid of all of these and use the tes
+
+const char* const kTestBuiltins[] = {
+ "kBuiltinFoo", "kBuiltinBar",
+};
+
+const char* const kTestUserTypeBuiltins[] = {
+ "kUserBuiltinFoo", "kUserBuiltinBar",
+};
+
+class TestingSchemeClassifier : public AutocompleteSchemeClassifier {
+ public:
+ TestingSchemeClassifier() {}
+
+ metrics::OmniboxInputType::Type GetInputTypeForScheme(
+ const std::string& scheme) const override {
+ return metrics::OmniboxInputType::URL;
+ }
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(TestingSchemeClassifier);
+};
+
+class TestAutocompleteProviderClient : public MockAutocompleteProviderClient {
+ public:
+ TestAutocompleteProviderClient() {}
+
+ std::vector<base::string16> GetBuiltinURLs() override;
+ std::vector<base::string16> GetBuiltinsToProvideAsUserTypes() override;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(TestAutocompleteProviderClient);
+};
+
+std::vector<base::string16> TestAutocompleteProviderClient::GetBuiltinURLs() {
+ std::vector<base::string16> builtins;
+ for (size_t i = 0; i < arraysize(kTestBuiltins); i++) {
+ builtins.push_back(base::ASCIIToUTF16(kTestBuiltins[i]));
+ }
+ return builtins;
+}
+
+std::vector<base::string16>
+TestAutocompleteProviderClient::GetBuiltinsToProvideAsUserTypes() {
+ std::vector<base::string16> builtins_to_provide;
+ for (size_t i = 0; i < arraysize(kTestUserTypeBuiltins); i++) {
+ builtins_to_provide.push_back(base::ASCIIToUTF16(kTestUserTypeBuiltins[i]));
+ }
+ return builtins_to_provide;
+}
+
+} // namespace
+
class BuiltinProviderTest : public testing::Test {
protected:
struct TestData {
@@ -37,8 +99,7 @@ class BuiltinProviderTest : public testing::Test {
~BuiltinProviderTest() override {}
void SetUp() override {
- profile_.reset(new TestingProfile());
- client_.reset(new ChromeAutocompleteProviderClient(profile_.get()));
+ client_.reset(new TestAutocompleteProviderClient());
provider_ = new BuiltinProvider(client_.get());
}
void TearDown() override { provider_ = NULL; }
@@ -51,7 +112,7 @@ class BuiltinProviderTest : public testing::Test {
const AutocompleteInput input(
cases[i].input, base::string16::npos, std::string(), GURL(),
metrics::OmniboxEventProto::INVALID_SPEC, true, false, true, true,
- false, ChromeAutocompleteSchemeClassifier(NULL));
+ false, TestingSchemeClassifier());
provider_->Start(input, false);
EXPECT_TRUE(provider_->done());
matches = provider_->matches();
@@ -67,27 +128,25 @@ class BuiltinProviderTest : public testing::Test {
content::TestBrowserThreadBundle thread_bundle_;
- scoped_ptr<TestingProfile> profile_;
- scoped_ptr<ChromeAutocompleteProviderClient> client_;
+ scoped_ptr<MockAutocompleteProviderClient> client_;
scoped_refptr<BuiltinProvider> provider_;
private:
DISALLOW_COPY_AND_ASSIGN(BuiltinProviderTest);
};
-#if !defined(OS_ANDROID)
TEST_F(BuiltinProviderTest, TypingScheme) {
const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
- const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
+ const base::string16 kChrome = ASCIIToUTF16(kChromeUIScheme);
const base::string16 kSeparator1 = ASCIIToUTF16(":");
const base::string16 kSeparator2 = ASCIIToUTF16(":/");
const base::string16 kSeparator3 =
ASCIIToUTF16(url::kStandardSchemeSeparator);
// These default URLs should correspond with those in BuiltinProvider::Start.
- const GURL kURL1 = GURL(chrome::kChromeUIChromeURLsURL);
- const GURL kURL2 = GURL(chrome::kChromeUISettingsURL);
- const GURL kURL3 = GURL(chrome::kChromeUIVersionURL);
+ const GURL kURL1 = GURL(kChromeUIChromeURLsURL);
+ const GURL kURL2 = GURL(kChromeUISettingsURL);
+ const GURL kURL3 = GURL(kChromeUIVersionURL);
TestData typing_scheme_cases[] = {
// Typing an unrelated scheme should give nothing.
@@ -122,53 +181,6 @@ TEST_F(BuiltinProviderTest, TypingScheme) {
RunTest(typing_scheme_cases, arraysize(typing_scheme_cases));
}
-#else // Android uses a subset of the URLs
-TEST_F(BuiltinProviderTest, TypingScheme) {
- const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
- const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
- const base::string16 kSeparator1 = ASCIIToUTF16(":");
- const base::string16 kSeparator2 = ASCIIToUTF16(":/");
- const base::string16 kSeparator3 =
- ASCIIToUTF16(url::kStandardSchemeSeparator);
-
- // These default URLs should correspond with those in BuiltinProvider::Start.
- const GURL kURL1 = GURL(chrome::kChromeUIChromeURLsURL);
- const GURL kURL2 = GURL(chrome::kChromeUIVersionURL);
-
- TestData typing_scheme_cases[] = {
- // Typing an unrelated scheme should give nothing.
- {ASCIIToUTF16("h"), 0, {}},
- {ASCIIToUTF16("http"), 0, {}},
- {ASCIIToUTF16("file"), 0, {}},
- {ASCIIToUTF16("abouz"), 0, {}},
- {ASCIIToUTF16("aboutt"), 0, {}},
- {ASCIIToUTF16("aboutt:"), 0, {}},
- {ASCIIToUTF16("chroma"), 0, {}},
- {ASCIIToUTF16("chromee"), 0, {}},
- {ASCIIToUTF16("chromee:"), 0, {}},
-
- // Typing a portion of about:// should give the default urls.
- {kAbout.substr(0, 1), 2, {kURL1, kURL2}},
- {ASCIIToUTF16("A"), 2, {kURL1, kURL2}},
- {kAbout, 2, {kURL1, kURL2}},
- {kAbout + kSeparator1, 2, {kURL1, kURL2}},
- {kAbout + kSeparator2, 2, {kURL1, kURL2}},
- {kAbout + kSeparator3, 2, {kURL1, kURL2}},
- {ASCIIToUTF16("aBoUT://"), 2, {kURL1, kURL2}},
-
- // Typing a portion of chrome:// should give the default urls.
- {kChrome.substr(0, 1), 2, {kURL1, kURL2}},
- {ASCIIToUTF16("C"), 2, {kURL1, kURL2}},
- {kChrome, 2, {kURL1, kURL2}},
- {kChrome + kSeparator1, 2, {kURL1, kURL2}},
- {kChrome + kSeparator2, 2, {kURL1, kURL2}},
- {kChrome + kSeparator3, 2, {kURL1, kURL2}},
- {ASCIIToUTF16("ChRoMe://"), 2, {kURL1, kURL2}},
- };
-
- RunTest(typing_scheme_cases, arraysize(typing_scheme_cases));
-}
-#endif
TEST_F(BuiltinProviderTest, NonChromeURLs) {
TestData non_chrome_url_cases[] = {
@@ -190,7 +202,7 @@ TEST_F(BuiltinProviderTest, NonChromeURLs) {
TEST_F(BuiltinProviderTest, ChromeURLs) {
const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
- const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
+ const base::string16 kChrome = ASCIIToUTF16(kChromeUIScheme);
const base::string16 kSeparator1 = ASCIIToUTF16(":");
const base::string16 kSeparator2 = ASCIIToUTF16(":/");
const base::string16 kSeparator3 =
@@ -198,12 +210,9 @@ TEST_F(BuiltinProviderTest, ChromeURLs) {
// This makes assumptions about the chrome URLs listed by the BuiltinProvider.
// Currently they are derived from chrome::kChromeHostURLs[].
- const base::string16 kHostM1 =
- ASCIIToUTF16(content::kChromeUIMediaInternalsHost);
- const base::string16 kHostM2 =
- ASCIIToUTF16(chrome::kChromeUIMemoryHost);
- const base::string16 kHostM3 =
- ASCIIToUTF16(chrome::kChromeUIMemoryInternalsHost);
+ const base::string16 kHostM1 = ASCIIToUTF16(kChromeUIMediaInternalsHost);
+ const base::string16 kHostM2 = ASCIIToUTF16(kChromeUIMemoryHost);
+ const base::string16 kHostM3 = ASCIIToUTF16(kChromeUIMemoryInternalsHost);
const GURL kURLM1 = GURL(kChrome + kSeparator3 + kHostM1);
const GURL kURLM2 = GURL(kChrome + kSeparator3 + kHostM2);
const GURL kURLM3 = GURL(kChrome + kSeparator3 + kHostM3);
@@ -243,7 +252,7 @@ TEST_F(BuiltinProviderTest, ChromeURLs) {
TEST_F(BuiltinProviderTest, AboutBlank) {
const base::string16 kAbout = ASCIIToUTF16(url::kAboutScheme);
- const base::string16 kChrome = ASCIIToUTF16(content::kChromeUIScheme);
+ const base::string16 kChrome = ASCIIToUTF16(kChromeUIScheme);
const base::string16 kAboutBlank = ASCIIToUTF16(url::kAboutBlankURL);
const base::string16 kBlank = ASCIIToUTF16("blank");
const base::string16 kSeparator1 =
@@ -251,8 +260,8 @@ TEST_F(BuiltinProviderTest, AboutBlank) {
const base::string16 kSeparator2 = ASCIIToUTF16(":///");
const base::string16 kSeparator3 = ASCIIToUTF16(";///");
- const GURL kURLBlob = GURL(kChrome + kSeparator1 +
- ASCIIToUTF16(content::kChromeUIBlobInternalsHost));
+ const GURL kURLBlob =
+ GURL(kChrome + kSeparator1 + ASCIIToUTF16(kChromeUIBlobInternalsHost));
const GURL kURLBlank = GURL(kAboutBlank);
TestData about_blank_cases[] = {
@@ -300,24 +309,21 @@ TEST_F(BuiltinProviderTest, DoesNotSupportMatchesOnFocus) {
const AutocompleteInput input(
ASCIIToUTF16("chrome://s"), base::string16::npos, std::string(), GURL(),
metrics::OmniboxEventProto::INVALID_SPEC, true, false, true, true, true,
- ChromeAutocompleteSchemeClassifier(NULL));
+ TestingSchemeClassifier());
provider_->Start(input, false);
EXPECT_TRUE(provider_->matches().empty());
}
-#if !defined(OS_ANDROID)
-// Disabled on Android where we use native UI instead of chrome://settings.
TEST_F(BuiltinProviderTest, ChromeSettingsSubpages) {
// This makes assumptions about the chrome URLs listed by the BuiltinProvider.
// Currently they are derived from chrome::kChromeHostURLs[].
- const base::string16 kSettings = ASCIIToUTF16(chrome::kChromeUISettingsURL);
- const base::string16 kDefaultPage1 = ASCIIToUTF16(chrome::kAutofillSubPage);
- const base::string16 kDefaultPage2 =
- ASCIIToUTF16(chrome::kClearBrowserDataSubPage);
+ const base::string16 kSettings = ASCIIToUTF16(kChromeUISettingsURL);
+ const base::string16 kDefaultPage1 = ASCIIToUTF16(kAutofillSubPage);
+ const base::string16 kDefaultPage2 = ASCIIToUTF16(kClearBrowserDataSubPage);
const GURL kDefaultURL1 = GURL(kSettings + kDefaultPage1);
const GURL kDefaultURL2 = GURL(kSettings + kDefaultPage2);
- const base::string16 kPage1 = ASCIIToUTF16(chrome::kSearchEnginesSubPage);
- const base::string16 kPage2 = ASCIIToUTF16(chrome::kSyncSetupSubPage);
+ const base::string16 kPage1 = ASCIIToUTF16(kSearchEnginesSubPage);
+ const base::string16 kPage2 = ASCIIToUTF16(kSyncSetupSubPage);
const GURL kURL1 = GURL(kSettings + kPage1);
const GURL kURL2 = GURL(kSettings + kPage2);
@@ -335,4 +341,3 @@ TEST_F(BuiltinProviderTest, ChromeSettingsSubpages) {
RunTest(settings_subpage_cases, arraysize(settings_subpage_cases));
}
-#endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698