| Index: chromeos/network/onc_merger.cc
|
| diff --git a/chrome/browser/chromeos/network_settings/onc_merger.cc b/chromeos/network/onc_merger.cc
|
| similarity index 98%
|
| rename from chrome/browser/chromeos/network_settings/onc_merger.cc
|
| rename to chromeos/network/onc_merger.cc
|
| index 7e706fb419342ee7460f1bd8965983b71c7b14f6..0db773a9e36987e8d0913916151613c37ba0ab56 100644
|
| --- a/chrome/browser/chromeos/network_settings/onc_merger.cc
|
| +++ b/chromeos/network/onc_merger.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/network_settings/onc_merger.h"
|
| +#include "chromeos/network/onc_merger.h"
|
|
|
| #include <set>
|
| #include <string>
|
| @@ -10,7 +10,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/logging.h"
|
| #include "base/values.h"
|
| -#include "chrome/browser/chromeos/cros/onc_constants.h"
|
| +#include "chromeos/network/onc_constants.h"
|
|
|
| namespace chromeos {
|
| namespace onc {
|
|
|