Update To 11.40.268.0

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

diff --git a/src/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/src/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index eeb0e7d..b437753 100644 (file)
--- a/src/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/src/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -16,7 +16,6 @@
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/base/ui_test_utils.h"
 #include "chromeos/chromeos_switches.h"
 #include "content/public/browser/web_contents.h"
 
@@ -38,20 +37,22 @@ class TestMultiUserWindowManager : public chrome::MultiUserWindowManager {
 
   // MultiUserWindowManager overrides:
   virtual void SetWindowOwner(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
-  virtual const std::string& GetWindowOwner(aura::Window* window) OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
+  virtual const std::string& GetWindowOwner(
+      aura::Window* window) const override;
   virtual void ShowWindowForUser(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
-  virtual bool AreWindowsSharedAmongUsers() OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
+  virtual bool AreWindowsSharedAmongUsers() const override;
   virtual void GetOwnersOfVisibleWindows(
-      std::set<std::string>* user_ids) OVERRIDE;
-  virtual bool IsWindowOnDesktopOfUser(aura::Window* window,
-                                       const std::string& user_id) OVERRIDE;
+      std::set<std::string>* user_ids) const override;
+  virtual bool IsWindowOnDesktopOfUser(
+      aura::Window* window,
+      const std::string& user_id) const override;
   virtual const std::string& GetUserPresentingWindow(
-      aura::Window* window) OVERRIDE;
-  virtual void AddUser(content::BrowserContext* profile) OVERRIDE;
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+      aura::Window* window) const override;
+  virtual void AddUser(content::BrowserContext* profile) override;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
 
  private:
   // The window of the visiting browser.
@@ -95,7 +96,7 @@ void TestMultiUserWindowManager::SetWindowOwner(
 }
 
 const std::string& TestMultiUserWindowManager::GetWindowOwner(
-    aura::Window* window) {
+    aura::Window* window) const {
   // No matter which window will get queried - all browsers belong to the
   // original browser's user.
   return browser_owner_;
@@ -112,22 +113,22 @@ void TestMultiUserWindowManager::ShowWindowForUser(
   created_window_shown_for_ = user_id;
 }
 
-bool TestMultiUserWindowManager::AreWindowsSharedAmongUsers() {
+bool TestMultiUserWindowManager::AreWindowsSharedAmongUsers() const {
   return browser_owner_ != desktop_owner_;
 }
 
 void TestMultiUserWindowManager::GetOwnersOfVisibleWindows(
-    std::set<std::string>* user_ids) {
+    std::set<std::string>* user_ids) const {
 }
 
 bool TestMultiUserWindowManager::IsWindowOnDesktopOfUser(
     aura::Window* window,
-    const std::string& user_id) {
+    const std::string& user_id) const {
   return GetUserPresentingWindow(window) == user_id;
 }
 
 const std::string& TestMultiUserWindowManager::GetUserPresentingWindow(
-    aura::Window* window) {
+    aura::Window* window) const {
   if (window == browser_window_)
     return desktop_owner_;
   if (created_window_ && window == created_window_)
@@ -152,7 +153,7 @@ GURL GetGoogleURL() {
 // Subclass that tests navigation while in the Guest session.
 class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest {
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     CommandLine command_line_copy = *command_line;
     command_line_copy.AppendSwitchASCII(
         chromeos::switches::kLoginProfile, "user");