Initialize shell and browser thread for views event tests.

Initialize shell and browser thread for views event tests.
 This is necessary as widget now needs shell to activate.

BUG=none
TEST=interactive_ui_tests no longer crashes.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=114277

[Ben Goodger (Google), 2011-12-13 19:56:28]

get rid of your LOG(WARNING)s.

On Tue, Dec 13, 2011 at 11:21 AM, <oshima@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Initialize shell and browser thread for views event tests.
>  This is necessary as widget new needs shell to activate.
>
> BUG=none
> TEST=interactive_ui_tests no longer crashes.
>
>
> Please review this at
http://codereview.chromium.**org/8937007/<http://codereview.chromium.org/8937...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M chrome/test/base/view_event_**test_base.h
>  M chrome/test/base/view_event_**test_base.cc
>
>
> Index: chrome/test/base/view_event_**test_base.cc
> diff --git a/chrome/test/base/view_event_**test_base.cc
> b/chrome/test/base/view_event_**test_base.cc
> index 91ab67be28d23dd93a65e142a83d17**759e2350a5..**
> 267c1bcbdbc0d06ad1293b6a5834b3**e8bc4de3af 100644
> --- a/chrome/test/base/view_event_**test_base.cc
> +++ b/chrome/test/base/view_event_**test_base.cc
> @@ -20,7 +20,10 @@
>  #include "ui/views/widget/widget.h"
>
>  #if defined(USE_AURA)
> +#include "content/browser/browser_**thread_impl.h"
> +#include "content/public/browser/**browser_thread.h"
>  #include "ui/aura/root_window.h"
> +#include "ui/aura_shell/shell.h"
>  #endif
>
>  namespace {
> @@ -61,6 +64,10 @@ ViewEventTestBase::**ViewEventTestBase()
>   : window_(NULL),
>     content_view_(NULL),
>     ALLOW_THIS_IN_INITIALIZER_**LIST(method_factory_(this)) {
> +#if defined(USE_AURA)
> +  main_thread_.reset(new content::BrowserThreadImpl(**
> content::BrowserThread::UI,
> +                                                    &message_loop_));
> +#endif
>  }
>
>  void ViewEventTestBase::Done() {
> @@ -89,6 +96,7 @@ void ViewEventTestBase::SetUp() {
>   ui::CompositorTestSupport::**Initialize();
>  #if defined(USE_AURA)
>   aura::RootWindow::GetInstance(**);
> +  aura_shell::Shell::**CreateInstance(NULL);
>  #endif
>   window_ = views::Widget::CreateWindow(**this);
>  }
> @@ -104,6 +112,7 @@ void ViewEventTestBase::TearDown() {
>     window_ = NULL;
>   }
>  #if defined(USE_AURA)
> +  aura_shell::Shell::**DeleteInstance();
>   aura::RootWindow::**DeleteInstance();
>  #endif
>   ui::CompositorTestSupport::**Terminate();
> @@ -140,21 +149,26 @@ ViewEventTestBase::~**ViewEventTestBase() {
>  }
>
>  void ViewEventTestBase::**StartMessageLoopAndRunTest() {
> +  LOG(WARNING) << "UI:" <<
> +      content::BrowserThread::**CurrentlyOn(content::**
> BrowserThread::UI);
> +
>   window_->Show();
>   // Make sure the window is the foreground window, otherwise none of the
>   // mouse events are going to be targeted correctly.
>  #if defined(OS_WIN)
>   SetForegroundWindow(window_->**GetNativeWindow());
>  #endif
> -
> +  LOG(WARNING) << "1";
>   // Flush any pending events to make sure we start with a clean slate.
>   ui_test_utils::**RunAllPendingInMessageLoop();
> +  LOG(WARNING) << "2";
>
>   // Schedule a task that starts the test. Need to do this as we're going
> to
>   // run the message loop.
>   MessageLoop::current()->**PostTask(
>       FROM_HERE,
>       base::Bind(&ViewEventTestBase:**:DoTestOnMessageLoop, this));
> +  LOG(WARNING) << "3";
>
>   ui_test_utils::RunMessageLoop(**);
>  }
> Index: chrome/test/base/view_event_**test_base.h
> diff --git a/chrome/test/base/view_event_**test_base.h
> b/chrome/test/base/view_event_**test_base.h
> index 556f65aaf9220cfef80e75aaab5a70**94ebb4e143..**
> b6e3dc9bf7ce24b89c294088a285be**3d41cc38c7 100644
> --- a/chrome/test/base/view_event_**test_base.h
> +++ b/chrome/test/base/view_event_**test_base.h
> @@ -23,6 +23,10 @@ namespace gfx {
>  class Size;
>  }
>
> +namespace content {
> +class BrowserThreadImpl;
> +}
> +
>  // Base class for Views based tests that dispatch events.
>  //
>  // As views based event test involves waiting for events to be processed,
> @@ -134,6 +138,10 @@ class ViewEventTestBase : public
> views::WidgetDelegate,
>
>   MessageLoopForUI message_loop_;
>
> +#if defined(USE_AURA)
> +  scoped_ptr<content::**BrowserThreadImpl> main_thread_;
> +#endif
> +
>   // Method factory used for time-outs.
>   ScopedRunnableMethodFactory<**ViewEventTestBase> method_factory_;
>
>
>
>

[oshima, 2011-12-13 19:59:28]

Yes, new patch has been uploaded.

- oshima

On Tue, Dec 13, 2011 at 11:56 AM, Ben Goodger (Google) <ben@chromium.org>wrote:

> get rid of your LOG(WARNING)s.
>
> On Tue, Dec 13, 2011 at 11:21 AM, <oshima@chromium.org> wrote:
>
>> Reviewers: Ben Goodger (Google),
>>
>> Description:
>> Initialize shell and browser thread for views event tests.
>>  This is necessary as widget new needs shell to activate.
>>
>> BUG=none
>> TEST=interactive_ui_tests no longer crashes.
>>
>>
>> Please review this at
http://codereview.chromium.**org/8937007/<http://codereview.chromium.org/8937...
>>
>> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>>
>> Affected files:
>>  M chrome/test/base/view_event_**test_base.h
>>  M chrome/test/base/view_event_**test_base.cc
>>
>>
>> Index: chrome/test/base/view_event_**test_base.cc
>> diff --git a/chrome/test/base/view_event_**test_base.cc
>> b/chrome/test/base/view_event_**test_base.cc
>> index 91ab67be28d23dd93a65e142a83d17**759e2350a5..**
>> 267c1bcbdbc0d06ad1293b6a5834b3**e8bc4de3af 100644
>> --- a/chrome/test/base/view_event_**test_base.cc
>> +++ b/chrome/test/base/view_event_**test_base.cc
>> @@ -20,7 +20,10 @@
>>  #include "ui/views/widget/widget.h"
>>
>>  #if defined(USE_AURA)
>> +#include "content/browser/browser_**thread_impl.h"
>> +#include "content/public/browser/**browser_thread.h"
>>  #include "ui/aura/root_window.h"
>> +#include "ui/aura_shell/shell.h"
>>  #endif
>>
>>  namespace {
>> @@ -61,6 +64,10 @@ ViewEventTestBase::**ViewEventTestBase()
>>   : window_(NULL),
>>     content_view_(NULL),
>>     ALLOW_THIS_IN_INITIALIZER_**LIST(method_factory_(this)) {
>> +#if defined(USE_AURA)
>> +  main_thread_.reset(new content::BrowserThreadImpl(**
>> content::BrowserThread::UI,
>> +                                                    &message_loop_));
>> +#endif
>>  }
>>
>>  void ViewEventTestBase::Done() {
>> @@ -89,6 +96,7 @@ void ViewEventTestBase::SetUp() {
>>   ui::CompositorTestSupport::**Initialize();
>>  #if defined(USE_AURA)
>>   aura::RootWindow::GetInstance(**);
>> +  aura_shell::Shell::**CreateInstance(NULL);
>>  #endif
>>   window_ = views::Widget::CreateWindow(**this);
>>  }
>> @@ -104,6 +112,7 @@ void ViewEventTestBase::TearDown() {
>>     window_ = NULL;
>>   }
>>  #if defined(USE_AURA)
>> +  aura_shell::Shell::**DeleteInstance();
>>   aura::RootWindow::**DeleteInstance();
>>  #endif
>>   ui::CompositorTestSupport::**Terminate();
>> @@ -140,21 +149,26 @@ ViewEventTestBase::~**ViewEventTestBase() {
>>  }
>>
>>  void ViewEventTestBase::**StartMessageLoopAndRunTest() {
>> +  LOG(WARNING) << "UI:" <<
>> +      content::BrowserThread::**CurrentlyOn(content::**
>> BrowserThread::UI);
>> +
>>   window_->Show();
>>   // Make sure the window is the foreground window, otherwise none of the
>>   // mouse events are going to be targeted correctly.
>>  #if defined(OS_WIN)
>>   SetForegroundWindow(window_->**GetNativeWindow());
>>  #endif
>> -
>> +  LOG(WARNING) << "1";
>>   // Flush any pending events to make sure we start with a clean slate.
>>   ui_test_utils::**RunAllPendingInMessageLoop();
>> +  LOG(WARNING) << "2";
>>
>>   // Schedule a task that starts the test. Need to do this as we're going
>> to
>>   // run the message loop.
>>   MessageLoop::current()->**PostTask(
>>       FROM_HERE,
>>       base::Bind(&ViewEventTestBase:**:DoTestOnMessageLoop, this));
>> +  LOG(WARNING) << "3";
>>
>>   ui_test_utils::RunMessageLoop(**);
>>  }
>> Index: chrome/test/base/view_event_**test_base.h
>> diff --git a/chrome/test/base/view_event_**test_base.h
>> b/chrome/test/base/view_event_**test_base.h
>> index 556f65aaf9220cfef80e75aaab5a70**94ebb4e143..**
>> b6e3dc9bf7ce24b89c294088a285be**3d41cc38c7 100644
>> --- a/chrome/test/base/view_event_**test_base.h
>> +++ b/chrome/test/base/view_event_**test_base.h
>> @@ -23,6 +23,10 @@ namespace gfx {
>>  class Size;
>>  }
>>
>> +namespace content {
>> +class BrowserThreadImpl;
>> +}
>> +
>>  // Base class for Views based tests that dispatch events.
>>  //
>>  // As views based event test involves waiting for events to be processed,
>> @@ -134,6 +138,10 @@ class ViewEventTestBase : public
>> views::WidgetDelegate,
>>
>>   MessageLoopForUI message_loop_;
>>
>> +#if defined(USE_AURA)
>> +  scoped_ptr<content::**BrowserThreadImpl> main_thread_;
>> +#endif
>> +
>>   // Method factory used for time-outs.
>>   ScopedRunnableMethodFactory<**ViewEventTestBase> method_factory_;
>>
>>
>>
>>
>

[oshima, 2011-12-13 20:20:41]

turns out that bookmark test defines its own BrowserThread for ui, so I
consolidated it into ViewEventTestBase.

[Ben Goodger (Google), 2011-12-13 21:29:15]

lgtm