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

Side by Side Diff: chrome/browser/ui/webui/ntp/most_visited_browsertest.cc

Issue 12084029: Simplify how TestChromeWebUIControllerFactory is registered now that multiple WebUIControllerFactor… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to head Created 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/file_path.h" 5 #include "base/file_path.h"
6 #include "chrome/browser/ui/webui/web_ui_browsertest.h"
7 #include "chrome/common/url_constants.h" 6 #include "chrome/common/url_constants.h"
8 #include "chrome/test/base/ui_test_utils.h" 7 #include "chrome/test/base/ui_test_utils.h"
8 #include "chrome/test/base/web_ui_browsertest.h"
9 #include "googleurl/src/gurl.h" 9 #include "googleurl/src/gurl.h"
10 10
11 class MostVisitedWebUITest : public WebUIBrowserTest { 11 class MostVisitedWebUITest : public WebUIBrowserTest {
12 public: 12 public:
13 virtual ~MostVisitedWebUITest() {} 13 virtual ~MostVisitedWebUITest() {}
14 14
15 virtual void SetUpInProcessBrowserTestFixture() { 15 virtual void SetUpInProcessBrowserTestFixture() {
16 WebUIBrowserTest::SetUpInProcessBrowserTestFixture(); 16 WebUIBrowserTest::SetUpInProcessBrowserTestFixture();
17 AddLibrary(FilePath(FILE_PATH_LITERAL("most_visited_page_test.js"))); 17 AddLibrary(FilePath(FILE_PATH_LITERAL("most_visited_page_test.js")));
18 } 18 }
19 19
20 virtual void SetUpOnMainThread() { 20 virtual void SetUpOnMainThread() {
21 WebUIBrowserTest::SetUpOnMainThread();
21 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL)); 22 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
22 } 23 }
23 }; 24 };
24 25
25 WEB_UI_UNITTEST_F(MostVisitedWebUITest, refreshDataBasic); 26 WEB_UI_UNITTEST_F(MostVisitedWebUITest, refreshDataBasic);
26 WEB_UI_UNITTEST_F(MostVisitedWebUITest, refreshDataOrdering); 27 WEB_UI_UNITTEST_F(MostVisitedWebUITest, refreshDataOrdering);
27 WEB_UI_UNITTEST_F(MostVisitedWebUITest, refreshDataPinning); 28 WEB_UI_UNITTEST_F(MostVisitedWebUITest, refreshDataPinning);
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698