Revert "Remove desktop auto-login since we don't plan on shipping it there. Refactor the base and …

chrome/browser/ui/auto_login_prompter.h

Index: chrome/browser/ui/auto_login_prompter.h
diff --git a/chrome/browser/ui/android/infobars/auto_login_prompter.h b/chrome/browser/ui/auto_login_prompter.h
similarity index 84%
rename from chrome/browser/ui/android/infobars/auto_login_prompter.h
rename to chrome/browser/ui/auto_login_prompter.h
index d4d58011c1179f4c91d683c782b70c33e7734763..27f28d79bdc84143c81ae5fc84e8d9491432b3fe 100644
--- a/chrome/browser/ui/android/infobars/auto_login_prompter.h
+++ b/chrome/browser/ui/auto_login_prompter.h
@@ -1,14 +1,14 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_UI_ANDROID_INFOBARS_AUTO_LOGIN_PROMPTER_H_
-#define CHROME_BROWSER_UI_ANDROID_INFOBARS_AUTO_LOGIN_PROMPTER_H_
+#ifndef CHROME_BROWSER_UI_AUTO_LOGIN_PROMPTER_H_
+#define CHROME_BROWSER_UI_AUTO_LOGIN_PROMPTER_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "chrome/browser/ui/android/infobars/auto_login_infobar_delegate.h"
+#include "chrome/browser/ui/auto_login_infobar_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
@@ -66,4 +66,4 @@ class AutoLoginPrompter : public content::WebContentsObserver {
   DISALLOW_COPY_AND_ASSIGN(AutoLoginPrompter);
 };
 
-#endif  // CHROME_BROWSER_UI_ANDROID_INFOBARS_AUTO_LOGIN_PROMPTER_H_
+#endif  // CHROME_BROWSER_UI_AUTO_LOGIN_PROMPTER_H_