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

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

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unused. Created 7 years, 1 month 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h" 5 #include "chrome/browser/ui/webui/ntp/new_tab_page_sync_handler.h"
6 6
7 #include "base/prefs/pref_service.h" 7 #include "base/prefs/pref_service.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 14 matching lines...) Expand all
25 class MockNewTabPageSyncHandler : public NewTabPageSyncHandler { 25 class MockNewTabPageSyncHandler : public NewTabPageSyncHandler {
26 public: 26 public:
27 MOCK_METHOD3(SendSyncMessageToPage, void(MessageType type, std::string msg, 27 MOCK_METHOD3(SendSyncMessageToPage, void(MessageType type, std::string msg,
28 std::string linktext)); 28 std::string linktext));
29 29
30 void SetWaitingForInitialPageLoad(bool waiting) { 30 void SetWaitingForInitialPageLoad(bool waiting) {
31 waiting_for_initial_page_load_ = waiting; 31 waiting_for_initial_page_load_ = waiting;
32 } 32 }
33 }; 33 };
34 34
35 // TODO(samarth): Delete along with the rest of the NTP4 code.
35 IN_PROC_BROWSER_TEST_F(NewTabPageSyncHandlerBrowserTest, 36 IN_PROC_BROWSER_TEST_F(NewTabPageSyncHandlerBrowserTest,
36 ChangeSigninAllowedToFalse) { 37 DISABLED_ChangeSigninAllowedToFalse) {
37 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL)); 38 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
38 content::WebUI* web_ui = 39 content::WebUI* web_ui =
39 browser()->tab_strip_model()->GetActiveWebContents()->GetWebUI(); 40 browser()->tab_strip_model()->GetActiveWebContents()->GetWebUI();
40 MockNewTabPageSyncHandler* mock_handler = new MockNewTabPageSyncHandler(); 41 MockNewTabPageSyncHandler* mock_handler = new MockNewTabPageSyncHandler();
41 mock_handler->SetWaitingForInitialPageLoad(false); 42 mock_handler->SetWaitingForInitialPageLoad(false);
42 web_ui->AddMessageHandler(mock_handler); 43 web_ui->AddMessageHandler(mock_handler);
43 EXPECT_CALL(*mock_handler, SendSyncMessageToPage(mock_handler->HIDE, _, _)); 44 EXPECT_CALL(*mock_handler, SendSyncMessageToPage(mock_handler->HIDE, _, _));
44 browser()->profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false); 45 browser()->profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
45 } 46 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/ntp/most_visited_browsertest.cc ('k') | chrome/browser/ui/webui/ntp/new_tab_ui_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698