| Index: chrome/browser/ui/extensions/extension_message_bubble_factory.cc
|
| diff --git a/chrome/browser/ui/extensions/extension_message_bubble_factory.cc b/chrome/browser/ui/extensions/extension_message_bubble_factory.cc
|
| index 178193b5d6156de22b45130ac7f269dd40d21717..c461bce72a47ab0d20b272a0ad5424795db6b23e 100644
|
| --- a/chrome/browser/ui/extensions/extension_message_bubble_factory.cc
|
| +++ b/chrome/browser/ui/extensions/extension_message_bubble_factory.cc
|
| @@ -112,7 +112,7 @@ ExtensionMessageBubbleFactory::GetController() {
|
| scoped_ptr<extensions::ExtensionMessageBubbleController> controller;
|
|
|
| if (g_override_for_testing == OVERRIDE_DISABLED)
|
| - return controller.Pass();
|
| + return controller;
|
|
|
| // The list of suspicious extensions takes priority over the dev mode bubble
|
| // and the settings API bubble, since that needs to be shown as soon as we
|
| @@ -129,7 +129,7 @@ ExtensionMessageBubbleFactory::GetController() {
|
| browser_->profile()),
|
| browser_));
|
| if (controller->ShouldShow())
|
| - return controller.Pass();
|
| + return controller;
|
| }
|
|
|
| if (EnableSettingsApiBubble()) {
|
| @@ -140,7 +140,7 @@ ExtensionMessageBubbleFactory::GetController() {
|
| browser_->profile(), extensions::BUBBLE_TYPE_STARTUP_PAGES),
|
| browser_));
|
| if (controller->ShouldShow())
|
| - return controller.Pass();
|
| + return controller;
|
| }
|
| }
|
|
|
| @@ -151,7 +151,7 @@ ExtensionMessageBubbleFactory::GetController() {
|
| browser_->profile()),
|
| browser_));
|
| if (controller->ShouldShow())
|
| - return controller.Pass();
|
| + return controller;
|
| }
|
|
|
| if (EnableDevModeBubble()) {
|
| @@ -161,11 +161,11 @@ ExtensionMessageBubbleFactory::GetController() {
|
| browser_->profile()),
|
| browser_));
|
| if (controller->ShouldShow())
|
| - return controller.Pass();
|
| + return controller;
|
| }
|
|
|
| controller.reset();
|
| - return controller.Pass();
|
| + return controller;
|
| }
|
|
|
| // static
|
|
|