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

Side by Side Diff: chrome/browser/ui/search/local_ntp_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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"
6 #include "base/strings/utf_string_conversions.h" 5 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/browser_process.h" 6 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/search/search.h" 7 #include "chrome/browser/search/search.h"
9 #include "chrome/browser/ui/search/instant_test_utils.h" 8 #include "chrome/browser/ui/search/instant_test_utils.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
11 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
12 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
13 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/base/ui_test_utils.h" 13 #include "chrome/test/base/ui_test_utils.h"
14 #include "components/prefs/pref_service.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "net/test/embedded_test_server/embedded_test_server.h" 16 #include "net/test/embedded_test_server/embedded_test_server.h"
17 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
18 18
19 class LocalNTPTest : public InProcessBrowserTest, 19 class LocalNTPTest : public InProcessBrowserTest,
20 public InstantTestBase { 20 public InstantTestBase {
21 public: 21 public:
22 LocalNTPTest() {} 22 LocalNTPTest() {}
23 23
24 protected: 24 protected:
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 GURL(chrome::kChromeUINewTabURL), 80 GURL(chrome::kChromeUINewTabURL),
81 NEW_FOREGROUND_TAB, 81 NEW_FOREGROUND_TAB,
82 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB | 82 ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB |
83 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 83 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
84 84
85 // Verify that the NTP is in French. 85 // Verify that the NTP is in French.
86 content::WebContents* active_tab = 86 content::WebContents* active_tab =
87 browser()->tab_strip_model()->GetActiveWebContents(); 87 browser()->tab_strip_model()->GetActiveWebContents();
88 EXPECT_EQ(base::ASCIIToUTF16("Nouvel onglet"), active_tab->GetTitle()); 88 EXPECT_EQ(base::ASCIIToUTF16("Nouvel onglet"), active_tab->GetTitle());
89 } 89 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/search/instant_test_utils.cc ('k') | chrome/browser/ui/search_engines/keyword_editor_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698