Move Drive API files to google_apis directory

chrome/browser/google_apis/gdata_util.cc

 // 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.
 
-#include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/google_apis/gdata_util.h"
 
 #include <string>
 #include <vector>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/chromeos/login/user_manager.h"

[yoshiki, 2012/09/10 05:43:43]

Don't include files under chrome/browser/chromeos/ from non-chromeos code.
Please put this line into between "#if defined(OS_CHROMEOS)" and "#endif".

[nhiroki, 2012/09/10 07:17:39]

Done in the separate patch (http://codereview.chromium.org/10914173/).

 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
 
 namespace gdata {
 namespace util {
@@ skipping 25 matching lines @@
   if (num_of_token > 1 && !base::StringToInt(parts[1], &minute))
     return false;
 
   *out_offset_to_utc_in_minutes = (hour * 60 + minute) * (ahead ? +1 : -1);
   return true;
 }
 
 }  // namespace
 
 bool IsGDataAvailable(Profile* profile) {
+#if defined(OS_CHROMEOS)
   if (!chromeos::UserManager::Get()->IsUserLoggedIn() ||
       chromeos::UserManager::Get()->IsLoggedInAsGuest() ||
       chromeos::UserManager::Get()->IsLoggedInAsDemoUser())
     return false;
 
   // Do not allow GData for incognito windows / guest mode.
   if (profile->IsOffTheRecord())
     return false;
 
   // Disable gdata if preference is set.  This can happen with commandline flag
   // --disable-gdata or enterprise policy, or probably with user settings too
   // in the future.
   if (profile->GetPrefs()->GetBoolean(prefs::kDisableGData))
     return false;
 
   return true;
+#else
+  // TODO(nhiroki): Check if GData is available or not in a platform independent
+  // way.
+  return false;
+#endif
 }
 
 bool IsDriveV2ApiEnabled() {
   static bool enabled = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableDriveV2Api);
   return enabled;
 }
 
 base::PlatformFileError DriveFileErrorToPlatformError(
     gdata::DriveFileError error) {
@@ skipping 191 matching lines @@
     const base::Closure& reply_task) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   const bool posted = blocking_task_runner->PostTaskAndReply(
       from_here, request_task, reply_task);
   DCHECK(posted);
 }
 
 }  // namespace util
 }  // namespace gdata