Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / test / base / browser_with_test_window_test.h

diff --git a/src/chrome/test/base/browser_with_test_window_test.h b/src/chrome/test/base/browser_with_test_window_test.h
index eb09afc..4c832f4 100644 (file)
--- a/src/chrome/test/base/browser_with_test_window_test.h
+++ b/src/chrome/test/base/browser_with_test_window_test.h
@@ -79,13 +79,16 @@ class WebContents;
 class BrowserWithTestWindowTest : public testing::Test {
  public:
   // Creates a BrowserWithTestWindowTest for which the initial window will be
-  // created on the native desktop.
+  // a tabbed browser created on the native desktop, which is not a hosted app.
   BrowserWithTestWindowTest();
-  virtual ~BrowserWithTestWindowTest();
 
-  // Sets the desktop on which the initial window will be created. Must be
-  // called before SetUp().
-  void SetHostDesktopType(chrome::HostDesktopType host_desktop_type);
+  // Creates a BrowserWithTestWindowTest for which the initial window will be
+  // the specified type.
+  BrowserWithTestWindowTest(Browser::Type browser_type,
+                            chrome::HostDesktopType host_desktop_type,
+                            bool hosted_app);
+
+  virtual ~BrowserWithTestWindowTest();
 
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
@@ -146,9 +149,11 @@ class BrowserWithTestWindowTest : public testing::Test {
   // value. Can return NULL to use the default window created by Browser.
   virtual BrowserWindow* CreateBrowserWindow();
 
-  // Creates the browser given |profile|, |host_desktop_type| and
-  // |browser_window|. The caller owns the return value.
+  // Creates the browser given |profile|, |browser_type|, |hosted_app|,
+  // |host_desktop_type| and |browser_window|. The caller owns the return value.
   virtual Browser* CreateBrowser(Profile* profile,
+                                 Browser::Type browser_type,
+                                 bool hosted_app,
                                  chrome::HostDesktopType host_desktop_type,
                                  BrowserWindow* browser_window);
 
@@ -195,9 +200,15 @@ class BrowserWithTestWindowTest : public testing::Test {
   ui::ScopedOleInitializer ole_initializer_;
 #endif
 
+  // The type of browser to create (tabbed or popup).
+  Browser::Type browser_type_;
+
   // The desktop to create the initial window on.
   chrome::HostDesktopType host_desktop_type_;
 
+  // Whether the browser is part of a hosted app.
+  bool hosted_app_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserWithTestWindowTest);
 };