chrome/browser/signin/signin_browsertest.cc - Issue 17167006: move sync_promo_ui to non-webui-specific directory

Side by Side Diff: chrome/browser/signin/signin_browsertest.cc

Issue 17167006: move sync_promo_ui to non-webui-specific directory (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: fixed include guard on moved file Created 7 years, 6 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

« no previous file with comments | « chrome/browser/signin/DEPS ('k') | chrome/browser/ui/app_list/chrome_signin_delegate.cc » ('j') | no next file with comments »

OLD	NEW
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 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_	5 #ifndef CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_

6 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_	6 #define CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_

7	7

8 #include "chrome/browser/signin/signin_manager.h"	8 #include "chrome/browser/signin/signin_manager.h"

9 #include "chrome/browser/signin/signin_manager_factory.h"	9 #include "chrome/browser/signin/signin_manager_factory.h"

10 #include "chrome/browser/ui/browser.h"	10 #include "chrome/browser/ui/browser.h"

11 #include "chrome/browser/ui/singleton_tabs.h"	11 #include "chrome/browser/ui/singleton_tabs.h"

	12 #include "chrome/browser/ui/sync/sync_promo_ui.h"

12 #include "chrome/browser/ui/tabs/tab_strip_model.h"	13 #include "chrome/browser/ui/tabs/tab_strip_model.h"

13 #include "chrome/browser/ui/webui/signin/login_ui_service.h"	14 #include "chrome/browser/ui/webui/signin/login_ui_service.h"

14 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"	15 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"

15 #include "chrome/browser/ui/webui/sync_promo/sync_promo_ui.h"

16 #include "chrome/common/url_constants.h"	16 #include "chrome/common/url_constants.h"

17 #include "chrome/test/base/in_process_browser_test.h"	17 #include "chrome/test/base/in_process_browser_test.h"

18 #include "chrome/test/base/ui_test_utils.h"	18 #include "chrome/test/base/ui_test_utils.h"

19 #include "content/public/browser/render_process_host.h"	19 #include "content/public/browser/render_process_host.h"

20 #include "content/public/browser/render_view_host.h"	20 #include "content/public/browser/render_view_host.h"

21 #include "content/public/browser/web_contents.h"	21 #include "content/public/browser/web_contents.h"

22 #include "google_apis/gaia/gaia_urls.h"	22 #include "google_apis/gaia/gaia_urls.h"

23 #include "net/url_request/test_url_fetcher_factory.h"	23 #include "net/url_request/test_url_fetcher_factory.h"

24	24

25 namespace {	25 namespace {

(...skipping 86 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112 EXPECT_EQ(kOneClickSigninEnabled,	112 EXPECT_EQ(kOneClickSigninEnabled,

113 signin->IsSigninProcess(active_tab_process_id));	113 signin->IsSigninProcess(active_tab_process_id));

114	114

115 // Navigating away should change the process.	115 // Navigating away should change the process.

116 ui_test_utils::NavigateToURL(browser(), GURL(kNonSigninURL));	116 ui_test_utils::NavigateToURL(browser(), GURL(kNonSigninURL));

117 EXPECT_FALSE(signin->IsSigninProcess(	117 EXPECT_FALSE(signin->IsSigninProcess(

118 active_tab->GetRenderProcessHost()->GetID()));	118 active_tab->GetRenderProcessHost()->GetID()));

119 }	119 }

120	120

121 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_	121 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_BROWSERTEST_H_

OLD	NEW