Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / omnibox / omnibox_api_browsertest.cc

diff --git a/src/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc b/src/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
index 6042557..d51d7a4 100644 (file)
--- a/src/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
+++ b/src/chrome/browser/extensions/api/omnibox/omnibox_api_browsertest.cc
@@ -36,7 +36,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, Basic) {
     autocomplete_controller->Start(
         AutocompleteInput(ASCIIToUTF16("keywor"), base::string16::npos,
                           base::string16(), GURL(), AutocompleteInput::NTP,
-                          true, false, true, AutocompleteInput::ALL_MATCHES));
+                          true, false, true, true));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
@@ -58,8 +58,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,
-                          AutocompleteInput::ALL_MATCHES));
+                          AutocompleteInput::NTP, true, false, true, true));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
@@ -169,7 +168,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) {
   autocomplete_controller->Start(
       AutocompleteInput(ASCIIToUTF16("keyword command"), base::string16::npos,
                         base::string16(), GURL(), AutocompleteInput::NTP,
-                        true, false, true, AutocompleteInput::ALL_MATCHES));
+                        true, false, true, true));
   omnibox_view->model()->AcceptInput(CURRENT_TAB, false);
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
@@ -184,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxApiTest, OnInputEntered) {
   autocomplete_controller->Start(
       AutocompleteInput(ASCIIToUTF16("keyword newtab"), base::string16::npos,
                         base::string16(), GURL(), AutocompleteInput::NTP,
-                        true, false, true, AutocompleteInput::ALL_MATCHES));
+                        true, false, true, true));
   omnibox_view->model()->AcceptInput(NEW_FOREGROUND_TAB, false);
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
@@ -221,8 +220,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,
-                          AutocompleteInput::ALL_MATCHES));
+                          AutocompleteInput::NTP, true, false, true, true));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
@@ -244,8 +242,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,
-                          AutocompleteInput::ALL_MATCHES));
+                          AutocompleteInput::NTP, true, false, true, true));
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }