Index: chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc |
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc |
index f790846bf186bf3418843220d99281006aa97640..ce22a2fb2eec58d315b377201f3b5218f60df1e6 100644 |
--- a/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc |
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager_browsertest.cc |
@@ -91,7 +91,7 @@ class MockAccessibilityObserver { |
bool observed_enabled_; |
int observed_type_; |
- scoped_ptr<AccessibilityStatusSubscription> accessibility_subscription_; |
+ std::unique_ptr<AccessibilityStatusSubscription> accessibility_subscription_; |
DISALLOW_COPY_AND_ASSIGN(MockAccessibilityObserver); |
}; |
@@ -205,7 +205,7 @@ int GetAutoclickDelayFromPref() { |
bool IsBrailleImeActive() { |
InputMethodManager* imm = InputMethodManager::Get(); |
- scoped_ptr<InputMethodDescriptors> descriptors = |
+ std::unique_ptr<InputMethodDescriptors> descriptors = |
imm->GetActiveIMEState()->GetActiveInputMethods(); |
for (InputMethodDescriptors::const_iterator i = descriptors->begin(); |
i != descriptors->end(); |