Re-land "[shill] Provide a cmd line toggle between flimflam and shill storage dirs"
This is so that we can easily switch to (and away from) using
the flimflam profile dir (and user profile dirs) when we start shill.
BUG=chromium-os:17253
TEST=unit
Change-Id: I0264162665607bb180688428c4640e42383ae355
Reviewed-on: http://gerrit.chromium.org/gerrit/6568
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>
diff --git a/manager_unittest.cc b/manager_unittest.cc
index 2450c86..f2869d1 100644
--- a/manager_unittest.cc
+++ b/manager_unittest.cc
@@ -11,8 +11,8 @@
#include <base/logging.h>
#include <base/stl_util-inl.h>
#include <chromeos/dbus/service_constants.h>
-#include <gtest/gtest.h>
#include <gmock/gmock.h>
+#include <gtest/gtest.h>
#include "shill/mock_control.h"
#include "shill/mock_device.h"