Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / autocomplete / autocomplete_browsertest.cc

diff --git a/src/chrome/browser/autocomplete/autocomplete_browsertest.cc b/src/chrome/browser/autocomplete/autocomplete_browsertest.cc
index e240859..6eb96b0 100644 (file)
--- a/src/chrome/browser/autocomplete/autocomplete_browsertest.cc
+++ b/src/chrome/browser/autocomplete/autocomplete_browsertest.cc
@@ -4,7 +4,6 @@
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
-#include "base/path_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
@@ -139,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
   {
     omnibox_view->model()->SetInputInProgress(true);
     autocomplete_controller->Start(AutocompleteInput(
-        base::ASCIIToUTF16("chrome"), base::string16::npos, base::string16(),
+        base::ASCIIToUTF16("chrome"), base::string16::npos, std::string(),
         GURL(), metrics::OmniboxEventProto::NTP, true, false, true, false,
         ChromeAutocompleteSchemeClassifier(browser()->profile())));
 
@@ -184,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) {
       content::NotificationService::AllSources());
   chrome::AddSelectedTabWithURL(browser(),
                                 GURL(url::kAboutBlankURL),
-                                content::PAGE_TRANSITION_AUTO_TOPLEVEL);
+                                ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
   EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
   chrome::CloseTab(browser());