| Index: chrome/browser/chromeos/login/signin/merge_session_throttle.cc
|
| diff --git a/chrome/browser/chromeos/login/merge_session_throttle.cc b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
|
| similarity index 94%
|
| rename from chrome/browser/chromeos/login/merge_session_throttle.cc
|
| rename to chrome/browser/chromeos/login/signin/merge_session_throttle.cc
|
| index 3b36b9713947f35d9aedc240862b872c2bb73052..8124cc68e079cd3c9714139c956d16c3665e1930 100644
|
| --- a/chrome/browser/chromeos/login/merge_session_throttle.cc
|
| +++ b/chrome/browser/chromeos/login/signin/merge_session_throttle.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/login/merge_session_throttle.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_throttle.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/lazy_instance.h"
|
| @@ -12,12 +12,12 @@
|
| #include "base/strings/string_util.h"
|
| #include "base/threading/non_thread_safe.h"
|
| #include "base/time/time.h"
|
| -#include "chrome/browser/chromeos/login/merge_session_load_page.h"
|
| -#include "chrome/browser/chromeos/login/merge_session_xhr_request_waiter.h"
|
| -#include "chrome/browser/chromeos/login/oauth2_login_manager.h"
|
| -#include "chrome/browser/chromeos/login/oauth2_login_manager_factory.h"
|
| -#include "chrome/browser/chromeos/login/user_manager.h"
|
| -#include "chrome/browser/chromeos/login/user_manager.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_load_page.h"
|
| +#include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.h"
|
| +#include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"
|
| +#include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
|
| +#include "chrome/browser/chromeos/login/users/user_manager.h"
|
| +#include "chrome/browser/chromeos/login/users/user_manager.h"
|
| #include "chrome/browser/google/google_util.h"
|
| #include "chrome/browser/net/chrome_url_request_context.h"
|
| #include "chrome/common/url_constants.h"
|
|
|