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

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

Issue 1349783006: Cleanup: Pass std::string as const reference if possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert third_party changes Created 5 years, 3 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 (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"
11 #include "chrome/common/url_constants.h" 11 #include "chrome/common/url_constants.h"
12 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "chrome/test/base/testing_profile.h" 13 #include "chrome/test/base/testing_profile.h"
14 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
15 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
16 #include "content/public/browser/web_ui.h" 16 #include "content/public/browser/web_ui.h"
17 #include "content/public/test/browser_test_utils.h" 17 #include "content/public/test/browser_test_utils.h"
18 #include "testing/gmock/include/gmock/gmock.h" 18 #include "testing/gmock/include/gmock/gmock.h"
19 #include "url/gurl.h" 19 #include "url/gurl.h"
20 20
21 using ::testing::_; 21 using ::testing::_;
22 22
23 typedef InProcessBrowserTest NewTabPageSyncHandlerBrowserTest; 23 typedef InProcessBrowserTest NewTabPageSyncHandlerBrowserTest;
24 24
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,
28 std::string linktext)); 28 void(MessageType type,
29 const std::string& msg,
30 const std::string& linktext));
29 31
30 void SetWaitingForInitialPageLoad(bool waiting) { 32 void SetWaitingForInitialPageLoad(bool waiting) {
31 waiting_for_initial_page_load_ = waiting; 33 waiting_for_initial_page_load_ = waiting;
32 } 34 }
33 }; 35 };
34 36
35 // TODO(samarth): Delete along with the rest of the NTP4 code. 37 // TODO(samarth): Delete along with the rest of the NTP4 code.
36 IN_PROC_BROWSER_TEST_F(NewTabPageSyncHandlerBrowserTest, 38 IN_PROC_BROWSER_TEST_F(NewTabPageSyncHandlerBrowserTest,
37 DISABLED_ChangeSigninAllowedToFalse) { 39 DISABLED_ChangeSigninAllowedToFalse) {
38 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL)); 40 ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
39 content::WebUI* web_ui = 41 content::WebUI* web_ui =
40 browser()->tab_strip_model()->GetActiveWebContents()->GetWebUI(); 42 browser()->tab_strip_model()->GetActiveWebContents()->GetWebUI();
41 MockNewTabPageSyncHandler* mock_handler = new MockNewTabPageSyncHandler(); 43 MockNewTabPageSyncHandler* mock_handler = new MockNewTabPageSyncHandler();
42 mock_handler->SetWaitingForInitialPageLoad(false); 44 mock_handler->SetWaitingForInitialPageLoad(false);
43 web_ui->AddMessageHandler(mock_handler); 45 web_ui->AddMessageHandler(mock_handler);
44 EXPECT_CALL(*mock_handler, SendSyncMessageToPage(mock_handler->HIDE, _, _)); 46 EXPECT_CALL(*mock_handler, SendSyncMessageToPage(mock_handler->HIDE, _, _));
45 browser()->profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false); 47 browser()->profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
46 } 48 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698