X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fchrome%2Fbrowser%2Fchromeos%2Flogin%2Fenrollment%2Fenrollment_screen_browsertest.cc;h=3ed5ce0559544a5036a18f2cce533c332a433b0e;hb=1afa4dd80ef85af7c90efaea6959db1d92330844;hp=ea3ff85527ac2bc45bb00695e6e0185f9a356b2e;hpb=90762837333c13ccf56f2ad88e4481fc71e8d281;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc b/src/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
index ea3ff85..3ed5ce0 100644
--- a/src/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
+++ b/src/chrome/browser/chromeos/login/enrollment/enrollment_screen_browsertest.cc
@@ -4,14 +4,12 @@
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
-#include "base/path_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/enrollment/enrollment_screen.h"
-#include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
+#include "chrome/browser/chromeos/login/screens/mock_base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/chromeos_test_utils.h"
 #include "content/public/test/test_utils.h"
@@ -41,21 +39,21 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, TestCancel) {
   ASSERT_TRUE(enrollment_screen != NULL);
 
   base::RunLoop run_loop;
-  MockScreenObserver mock_screen_observer;
-  static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
-      &mock_screen_observer;
+  MockBaseScreenDelegate mock_base_screen_delegate;
+  static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
+      &mock_base_screen_delegate;
 
   ASSERT_EQ(WizardController::default_controller()->current_screen(),
             enrollment_screen);
 
-  EXPECT_CALL(mock_screen_observer,
-              OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_COMPLETED))
+  EXPECT_CALL(mock_base_screen_delegate,
+              OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_COMPLETED))
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   enrollment_screen->OnCancel();
   content::RunThisRunLoop(&run_loop);
-  Mock::VerifyAndClearExpectations(&mock_screen_observer);
+  Mock::VerifyAndClearExpectations(&mock_base_screen_delegate);
 
-  static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+  static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
       WizardController::default_controller();
 }
 
@@ -69,9 +67,9 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, DISABLED_TestSuccess) {
   ASSERT_TRUE(enrollment_screen != NULL);
 
   base::RunLoop run_loop;
-  MockScreenObserver mock_screen_observer;
-  static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
-      &mock_screen_observer;
+  MockBaseScreenDelegate mock_base_screen_delegate;
+  static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
+      &mock_base_screen_delegate;
 
   ASSERT_EQ(WizardController::default_controller()->current_screen(),
             enrollment_screen);
@@ -81,7 +79,7 @@ IN_PROC_BROWSER_TEST_F(EnrollmentScreenTest, DISABLED_TestSuccess) {
   run_loop.RunUntilIdle();
   EXPECT_TRUE(StartupUtils::IsOobeCompleted());
 
-  static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+  static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
       WizardController::default_controller();
 }
 
@@ -91,7 +89,7 @@ class ProvisionedEnrollmentScreenTest : public EnrollmentScreenTest {
 
  private:
   // Overridden from InProcessBrowserTest:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     base::FilePath test_data_dir;
     ASSERT_TRUE(chromeos::test_utils::GetTestDataPath(
                     "app_mode", "kiosk_manifest", &test_data_dir));
@@ -111,21 +109,21 @@ IN_PROC_BROWSER_TEST_F(ProvisionedEnrollmentScreenTest, TestBackButton) {
   ASSERT_TRUE(enrollment_screen != NULL);
 
   base::RunLoop run_loop;
-  MockScreenObserver mock_screen_observer;
-  static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
-      &mock_screen_observer;
+  MockBaseScreenDelegate mock_base_screen_delegate;
+  static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
+      &mock_base_screen_delegate;
 
   ASSERT_EQ(WizardController::default_controller()->current_screen(),
             enrollment_screen);
 
-  EXPECT_CALL(mock_screen_observer,
-              OnExit(ScreenObserver::ENTERPRISE_ENROLLMENT_BACK))
+  EXPECT_CALL(mock_base_screen_delegate,
+              OnExit(BaseScreenDelegate::ENTERPRISE_ENROLLMENT_BACK))
       .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
   enrollment_screen->OnCancel();
   content::RunThisRunLoop(&run_loop);
-  Mock::VerifyAndClearExpectations(&mock_screen_observer);
+  Mock::VerifyAndClearExpectations(&mock_base_screen_delegate);
 
-  static_cast<WizardScreen*>(enrollment_screen)->screen_observer_ =
+  static_cast<BaseScreen*>(enrollment_screen)->base_screen_delegate_ =
       WizardController::default_controller();
 }