Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / ui / idle_app_name_notification_view_unittest.cc

diff --git a/src/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc b/src/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
index fef6630..2f2481e 100644 (file)
--- a/src/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
+++ b/src/chrome/browser/chromeos/ui/idle_app_name_notification_view_unittest.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "extensions/common/manifest_constants.h"
-#include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
@@ -30,7 +30,7 @@ class IdleAppNameNotificationViewTest : public BrowserWithTestWindowTest {
   virtual ~IdleAppNameNotificationViewTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Add the application switch.
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(::switches::kAppId,
                                                         kTestAppName);
@@ -65,14 +65,18 @@ class IdleAppNameNotificationViewTest : public BrowserWithTestWindowTest {
                                       &error);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // The destruction of the widget might be a delayed task.
     base::MessageLoop::current()->RunUntilIdle();
     BrowserWithTestWindowTest::TearDown();
   }
 
-  extensions::Extension* correct_extension() { return correct_extension_; }
-  extensions::Extension* incorrect_extension() { return incorrect_extension_; }
+  extensions::Extension* correct_extension() {
+    return correct_extension_.get();
+  }
+  extensions::Extension* incorrect_extension() {
+    return incorrect_extension_.get();
+  }
 
  private:
   // Extensions to test with.