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

Unified Diff: chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc

Issue 343523003: Remove AutocompleteInput Type and PageClassification. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
Index: chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
index d51d7a446eaaad3b35421c6529000f0ee72de648..1a28015123d065c152c703fcd81a566333c8be2d 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
@@ -15,9 +15,11 @@
#include "chrome/browser/ui/omnibox/location_bar.h"
#include "chrome/browser/ui/omnibox/omnibox_view.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/metrics/proto/omnibox_event.pb.h"
#include "ui/base/window_open_disposition.h"
using base::ASCIIToUTF16;
+using metrics::OmniboxEventProto;
IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
ASSERT_TRUE(RunExtensionTest("omnibox")) << message_;
@@ -35,7 +37,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
{
autocomplete_controller->Start(
AutocompleteInput(ASCIIToUTF16("keywor"), base::string16::npos,
- base::string16(), GURL(), AutocompleteInput::NTP,
+ base::string16(), GURL(), OmniboxEventProto::NTP,
true, false, true, true));
WaitForAutocompleteDone(autocomplete_controller);
EXPECT_TRUE(autocomplete_controller->done());
@@ -58,7 +60,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
autocomplete_controller->Start(
AutocompleteInput(ASCIIToUTF16("keyword suggestio"),
base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::NTP, true, false, true, true));
+ OmniboxEventProto::NTP, true, false, true, true));
WaitForAutocompleteDone(autocomplete_controller);
EXPECT_TRUE(autocomplete_controller->done());
@@ -167,7 +169,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) {
autocomplete_controller->Start(
AutocompleteInput(ASCIIToUTF16("keyword command"), base::string16::npos,
- base::string16(), GURL(), AutocompleteInput::NTP,
+ base::string16(), GURL(), OmniboxEventProto::NTP,
true, false, true, true));
omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
WaitForAutocompleteDone(autocomplete_controller);
@@ -182,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) {
autocomplete_controller->Start(
AutocompleteInput(ASCIIToUTF16("keyword newtab"), base::string16::npos,
- base::string16(), GURL(), AutocompleteInput::NTP,
+ base::string16(), GURL(), OmniboxEventProto::NTP,
true, false, true, true));
omnibox_view->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
WaitForAutocompleteDone(autocomplete_controller);
@@ -220,7 +222,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) {
autocomplete_controller->Start(
AutocompleteInput(ASCIIToUTF16("keyword suggestio"),
base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::NTP, true, false, true, true));
+ OmniboxEventProto::NTP, true, false, true, true));
WaitForAutocompleteDone(autocomplete_controller);
EXPECT_TRUE(autocomplete_controller->done());
@@ -242,7 +244,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, DISABLED_IncognitoSplitMode) {
autocomplete_controller->Start(
AutocompleteInput(ASCIIToUTF16("keyword command incognito"),
base::string16::npos, base::string16(), GURL(),
- AutocompleteInput::NTP, true, false, true, true));
+ OmniboxEventProto::NTP, true, false, true, true));
location_bar->AcceptInput();
EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
}

Powered by Google App Engine
This is Rietveld 408576698