Move Google-specific code under browser/ into browser/google/.

BUG=50548
TEST=compiles

Review URL: http://codereview.chromium.org/3280008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57922 0039d316-1c4b-4281-b951-d872f2087c98

29 files changed, 44 insertions, 45 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit.cc b/chrome/browser/autocomplete/autocomplete_edit.cc
index b4b09c3..f63c2b8 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_omnibox_api.h"
-#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/url_fixer_upper.h"
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index bf9f5a5..bd5063f 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -15,7 +15,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index c208fe4..89b5ea0 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -51,8 +51,8 @@
 #include "chrome/browser/find_bar.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/first_run/first_run.h"
-#include "chrome/browser/google_url_tracker.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/host_zoom_map.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/metrics/user_metrics.h"
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 2440aa4..885e390 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -26,7 +26,7 @@
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/first_run/first_run.h"
-#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/in_process_webkit/dom_storage_context.h"
 #include "chrome/browser/intranet_redirect_detector.h"
diff --git a/chrome/browser/chromeos/google_update_chromeos.cc b/chrome/browser/chromeos/google_update_chromeos.cc
index a7b2cc3..c1bf0ba 100644
--- a/chrome/browser/chromeos/google_update_chromeos.cc
+++ b/chrome/browser/chromeos/google_update_chromeos.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/google_update.h"
+#include "chrome/browser/google/google_update.h"
 
 #include "base/message_loop.h"
 #include "base/path_service.h"
diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc
index 6cc2ee8..d2da133 100644
--- a/chrome/browser/chromeos/login/helper.cc
+++ b/chrome/browser/chromeos/login/helper.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/chromeos/login/helper.h"
 
 #include "app/resource_bundle.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "gfx/canvas_skia.h"
 #include "googleurl/src/gurl.h"
 #include "grit/theme_resources.h"
diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc
index 9be3548..b01081a 100644
--- a/chrome/browser/dom_ui/ntp_resource_cache.cc
+++ b/chrome/browser/dom_ui/ntp_resource_cache.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
 #include "chrome/browser/dom_ui/shown_sections_handler.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/themes/browser_theme_provider.h"
diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc
index ebb12e6..08f2af3 100644
--- a/chrome/browser/extensions/extensions_ui.cc
+++ b/chrome/browser/extensions/extensions_ui.cc
@@ -26,7 +26,7 @@
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/extensions/extension_updater.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
diff --git a/chrome/browser/google_update.cc b/chrome/browser/google/google_update.cc
index dca2e9d..ee7547d 100644
--- a/chrome/browser/google_update.cc
+++ b/chrome/browser/google/google_update.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/google_update.h"
+#include "chrome/browser/google/google_update.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
diff --git a/chrome/browser/google_update.h b/chrome/browser/google/google_update.h
index 8487cd8..24ff093 100644
--- a/chrome/browser/google_update.h
+++ b/chrome/browser/google/google_update.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_UPDATE_H_
-#define CHROME_BROWSER_GOOGLE_UPDATE_H_
+#ifndef CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_H_
+#define CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_H_
 #pragma once
 
 #include <string>
@@ -141,4 +141,4 @@ class GoogleUpdate : public base::RefCountedThreadSafe<GoogleUpdate> {
   DISALLOW_COPY_AND_ASSIGN(GoogleUpdate);
 };
 
-#endif  // CHROME_BROWSER_GOOGLE_UPDATE_H_
+#endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UPDATE_H_
diff --git a/chrome/browser/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc
index 7a77e60..58be4b9 100644
--- a/chrome/browser/google_update_settings_posix.cc
+++ b/chrome/browser/google/google_update_settings_posix.cc
@@ -70,7 +70,7 @@ bool GoogleUpdateSettings::SetMetricsId(const std::wstring& client_id) {
 }
 
 // GetLastRunTime and SetLastRunTime are not implemented for posix. Their
-// currebnt return values signal failure which the caller is designed to
+// current return values signal failure which the caller is designed to
 // handle.
 
 // static
diff --git a/chrome/browser/google_update_settings_unittest.cc b/chrome/browser/google/google_update_settings_unittest.cc
index 8dc56bb..8dc56bb 100644
--- a/chrome/browser/google_update_settings_unittest.cc
+++ b/chrome/browser/google/google_update_settings_unittest.cc
diff --git a/chrome/browser/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc
index 4adc64f..6760483 100644
--- a/chrome/browser/google_url_tracker.cc
+++ b/chrome/browser/google/google_url_tracker.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/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 
 #include <vector>
 
diff --git a/chrome/browser/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
index e852e18..4b9ba57 100644
--- a/chrome/browser/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_GOOGLE_URL_TRACKER_H_
-#define CHROME_BROWSER_GOOGLE_URL_TRACKER_H_
+#ifndef CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
+#define CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
 #pragma once
 
 #include <string>
@@ -159,4 +159,4 @@ class GoogleURLTracker : public URLFetcher::Delegate,
   DISALLOW_COPY_AND_ASSIGN(GoogleURLTracker);
 };
 
-#endif  // CHROME_BROWSER_GOOGLE_URL_TRACKER_H_
+#endif  // CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
diff --git a/chrome/browser/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc
index f0a6d2a..d23e9ea 100644
--- a/chrome/browser/google_url_tracker_unittest.cc
+++ b/chrome/browser/google/google_url_tracker_unittest.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/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile.h"
diff --git a/chrome/browser/google_util.cc b/chrome/browser/google/google_util.cc
index e8553e9..a9a3439 100644
--- a/chrome/browser/google_util.cc
+++ b/chrome/browser/google/google_util.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 
 #include <string>
 
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/registry_controlled_domain.h"
 
diff --git a/chrome/browser/google_util.h b/chrome/browser/google/google_util.h
index e828791..3741e70 100644
--- a/chrome/browser/google_util.h
+++ b/chrome/browser/google/google_util.h
@@ -4,8 +4,8 @@
 //
 // Some Google related utility functions.
 
-#ifndef CHROME_BROWSER_GOOGLE_UTIL_H__
-#define CHROME_BROWSER_GOOGLE_UTIL_H__
+#ifndef CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
+#define CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 #pragma once
 
 class GURL;
@@ -24,4 +24,4 @@ GURL AppendGoogleTLDParam(const GURL& url);
 
 }  // namespace google_util
 
-#endif  // CHROME_BROWSER_GOOGLE_UTIL_H__
+#endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
diff --git a/chrome/browser/net/url_request_mock_link_doctor_job.cc b/chrome/browser/net/url_request_mock_link_doctor_job.cc
index 88ef438..e34baa9 100644
--- a/chrome/browser/net/url_request_mock_link_doctor_job.cc
+++ b/chrome/browser/net/url_request_mock_link_doctor_job.cc
@@ -5,7 +5,7 @@
 #include "chrome/browser/net/url_request_mock_link_doctor_job.h"
 
 #include "base/path_service.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/common/chrome_paths.h"
 #include "googleurl/src/gurl.h"
 #include "net/url_request/url_request_filter.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 3752ddc..2b37c26 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/external_protocol_handler.h"
 #include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/geolocation_prefs.h"
-#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/gtk/certificate_manager.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/host_zoom_map.h"
diff --git a/chrome/browser/remoting/remoting_resources_source.cc b/chrome/browser/remoting/remoting_resources_source.cc
index a57596a..fe75d4b 100644
--- a/chrome/browser/remoting/remoting_resources_source.cc
+++ b/chrome/browser/remoting/remoting_resources_source.cc
@@ -10,7 +10,7 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index 72532af..bcc28cb 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_operation_notification_details.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc
index 80c3d3ad..d81260f 100644
--- a/chrome/browser/safe_browsing/safe_browsing_util.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_util.cc
@@ -8,7 +8,7 @@
 #include "base/hmac.h"
 #include "base/sha2.h"
 #include "base/string_util.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc
index 47c782d..5eb345e 100644
--- a/chrome/browser/search_engines/template_url_model.cc
+++ b/chrome/browser/search_engines/template_url_model.cc
@@ -11,7 +11,7 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extensions_service.h"
-#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/net/url_fixer_upper.h"
diff --git a/chrome/browser/sync/sync_setup_wizard.cc b/chrome/browser/sync/sync_setup_wizard.cc
index 8ef359f..ffca308 100644
--- a/chrome/browser/sync/sync_setup_wizard.cc
+++ b/chrome/browser/sync/sync_setup_wizard.cc
@@ -9,7 +9,7 @@
 #include "base/singleton.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/dom_ui/chrome_url_data_manager.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/sync/profile_sync_service.h"
diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc
index b22c2f8..0bcaa84 100644
--- a/chrome/browser/tab_contents/tab_contents.cc
+++ b/chrome/browser/tab_contents/tab_contents.cc
@@ -42,7 +42,7 @@
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/favicon_service.h"
 #include "chrome/browser/find_bar_state.h"
-#include "chrome/browser/google_util.h"
+#include "chrome/browser/google/google_util.h"
 #include "chrome/browser/host_content_settings_map.h"
 #include "chrome/browser/hung_renderer_dialog.h"
 #include "chrome/browser/message_box_handler.h"
diff --git a/chrome/browser/views/about_chrome_view.h b/chrome/browser/views/about_chrome_view.h
index f3b6bee..828c4e6 100644
--- a/chrome/browser/views/about_chrome_view.h
+++ b/chrome/browser/views/about_chrome_view.h
@@ -13,7 +13,7 @@
 #include "views/window/dialog_delegate.h"
 
 #if defined(OS_WIN) || defined(OS_CHROMEOS)
-#include "chrome/browser/google_update.h"
+#include "chrome/browser/google/google_update.h"
 #endif
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/version_loader.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 402a5f7..9f56d0b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1565,14 +1565,13 @@
         'browser/geolocation/win7_location_api_win.h',
         'browser/geolocation/win7_location_provider_win.cc',
         'browser/geolocation/win7_location_provider_win.h',
-        'browser/google_service_auth_error.h',
-        'browser/google_update.cc',
-        'browser/google_update.h',
-        'browser/google_update_settings_posix.cc',
-        'browser/google_url_tracker.cc',
-        'browser/google_url_tracker.h',
-        'browser/google_util.cc',
-        'browser/google_util.h',
+        'browser/google/google_update.cc',
+        'browser/google/google_update.h',
+        'browser/google/google_update_settings_posix.cc',
+        'browser/google/google_url_tracker.cc',
+        'browser/google/google_url_tracker.h',
+        'browser/google/google_util.cc',
+        'browser/google/google_util.h',
         'browser/gpu_process_host.cc',
         'browser/gpu_process_host.h',
         'browser/gpu_process_host_ui_shim.cc',
@@ -3835,7 +3834,7 @@
             'browser/bookmarks/bookmark_menu_controller.h',
             'browser/browser_accessibility_win.cc',
             'browser/browser_accessibility_manager_win.cc',
-            'browser/google_update.cc',
+            'browser/google/google_update.cc',
             'browser/history/history_indexer.idl',
             'browser/history_tab_ui.cc',
             'browser/history_view.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index bcdb6bb..93b403c 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1088,8 +1088,8 @@
         'browser/geolocation/win7_location_api_unittest_win.cc',
         'browser/geolocation/win7_location_provider_unittest_win.cc',
         'browser/global_keyboard_shortcuts_mac_unittest.mm',
-        'browser/google_update_settings_unittest.cc',
-        'browser/google_url_tracker_unittest.cc',
+        'browser/google/google_update_settings_unittest.cc',
+        'browser/google/google_url_tracker_unittest.cc',
         'browser/gtk/bookmark_bar_gtk_unittest.cc',
         'browser/gtk/bookmark_editor_gtk_unittest.cc',
         'browser/gtk/bookmark_utils_gtk_unittest.cc',
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 1883978..fb2d2fc 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -19,7 +19,7 @@
 #include "base/string_util.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/notification_service.h"