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

Side by Side Diff: chrome/browser/ui/views/frame/test_with_browser_view.h

Issue 1699973002: Remove HostDesktopType from BrowserWithTestWindowTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-22
Patch Set: cros 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 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/test/base/browser_with_test_window_test.h" 10 #include "chrome/test/base/browser_with_test_window_test.h"
11 11
12 namespace chrome { 12 namespace chrome {
13 class TestingIOThreadState; 13 class TestingIOThreadState;
14 } 14 }
15 15
16 namespace predictors { 16 namespace predictors {
17 class PredictorDatabase; 17 class PredictorDatabase;
18 } 18 }
19 19
20 class BrowserView; 20 class BrowserView;
21 class ScopedTestingLocalState; 21 class ScopedTestingLocalState;
22 22
23 // Base class for BrowserView based unit tests. TestWithBrowserView creates 23 // Base class for BrowserView based unit tests. TestWithBrowserView creates
24 // a Browser with a valid BrowserView and BrowserFrame with as little else as 24 // a Browser with a valid BrowserView and BrowserFrame with as little else as
25 // possible. 25 // possible.
26 class TestWithBrowserView : public BrowserWithTestWindowTest { 26 class TestWithBrowserView : public BrowserWithTestWindowTest {
27 public: 27 public:
28 TestWithBrowserView(); 28 TestWithBrowserView();
29 TestWithBrowserView(Browser::Type browser_type, 29 TestWithBrowserView(Browser::Type browser_type, bool hosted_app);
30 chrome::HostDesktopType host_desktop_type,
31 bool hosted_app);
32 ~TestWithBrowserView() override; 30 ~TestWithBrowserView() override;
33 31
34 // BrowserWithTestWindowTest overrides: 32 // BrowserWithTestWindowTest overrides:
35 void SetUp() override; 33 void SetUp() override;
36 void TearDown() override; 34 void TearDown() override;
37 TestingProfile* CreateProfile() override; 35 TestingProfile* CreateProfile() override;
38 BrowserWindow* CreateBrowserWindow() override; 36 BrowserWindow* CreateBrowserWindow() override;
39 37
40 BrowserView* browser_view() { return browser_view_; } 38 BrowserView* browser_view() { return browser_view_; }
41 39
42 private: 40 private:
43 BrowserView* browser_view_; // Not owned. 41 BrowserView* browser_view_; // Not owned.
44 scoped_ptr<ScopedTestingLocalState> local_state_; 42 scoped_ptr<ScopedTestingLocalState> local_state_;
45 scoped_ptr<predictors::PredictorDatabase> predictor_db_; 43 scoped_ptr<predictors::PredictorDatabase> predictor_db_;
46 scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_; 44 scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
47 45
48 DISALLOW_COPY_AND_ASSIGN(TestWithBrowserView); 46 DISALLOW_COPY_AND_ASSIGN(TestWithBrowserView);
49 }; 47 };
50 48
51 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ 49 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698