Fixes CRLF and trailing white spaces.

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

16 files changed, 101 insertions, 101 deletions

diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index 9e724f8..96c779a 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -74,7 +74,7 @@ IPC_BEGIN_MESSAGES(Automation)
   // This message notifies the AutomationProvider to navigate to a specified
   // url in the tab with given handle. The first parameter is the handle to
   // the tab resource. The second parameter is the target url.  The return
-  // value contains a status code which is nonnegative on success. 
+  // value contains a status code which is nonnegative on success.
   // See AutomationMsg_NavigationResponseValues for the return value.
   IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_NavigateToURL, int, GURL,
                              AutomationMsg_NavigationResponseValues)
@@ -128,7 +128,7 @@ IPC_BEGIN_MESSAGES(Automation)
   // The return value contains the size of the title string. On error, this
   // value should be -1 and empty string. Note that the title can be empty in
   // which case the size would be 0.
-  IPC_SYNC_MESSAGE_ROUTED1_2(AutomationMsg_TabTitle, 
+  IPC_SYNC_MESSAGE_ROUTED1_2(AutomationMsg_TabTitle,
                              int,
                              int,
                              std::wstring)
@@ -798,7 +798,7 @@ IPC_BEGIN_MESSAGES(Automation)
 
   // Queries whether an app modal dialog is currently being shown. (i.e. a
   // javascript alert) and which buttons it contains.
-  IPC_SYNC_MESSAGE_ROUTED0_2(AutomationMsg_ShowingAppModalDialog, 
+  IPC_SYNC_MESSAGE_ROUTED0_2(AutomationMsg_ShowingAppModalDialog,
                              bool /* showing dialog */,
                              int /* view::DelegateDialog::DialogButton */)
 
diff --git a/chrome/test/data/extensions/bad/invalid_manifest/1/manifest.json b/chrome/test/data/extensions/bad/invalid_manifest/1/manifest.json
index 3aac2d6..0eb81fa 100644
--- a/chrome/test/data/extensions/bad/invalid_manifest/1/manifest.json
+++ b/chrome/test/data/extensions/bad/invalid_manifest/1/manifest.json
@@ -1 +1 @@
-I am not a manifest

+I am not a manifest
diff --git a/chrome/test/data/extensions/bad/missing_content_script/1/manifest.json b/chrome/test/data/extensions/bad/missing_content_script/1/manifest.json
index af1ea06..55e62a4 100644
--- a/chrome/test/data/extensions/bad/missing_content_script/1/manifest.json
+++ b/chrome/test/data/extensions/bad/missing_content_script/1/manifest.json
@@ -1,13 +1,13 @@
-{

-  "format_version": 1,

-  "id": "00123456789ABCDEF0123456789ABCDEF0123456",

-  "version": "1.0.0.0",

-  "name": "My extension 1",

-  "description": "The first extension that I made.",

-  "content_scripts": [

-    {

-      "matches": ["http://*.yahoo.com/*"],

-      "files": ["script1.js"]

-    }

-  ]

-}

+{
+  "format_version": 1,
+  "id": "00123456789ABCDEF0123456789ABCDEF0123456",
+  "version": "1.0.0.0",
+  "name": "My extension 1",
+  "description": "The first extension that I made.",
+  "content_scripts": [
+    {
+      "matches": ["http://*.yahoo.com/*"],
+      "files": ["script1.js"]
+    }
+  ]
+}
diff --git a/chrome/test/data/extensions/good/extension1/1/manifest.json b/chrome/test/data/extensions/good/extension1/1/manifest.json
index 5a43dd0..bb8944b 100644
--- a/chrome/test/data/extensions/good/extension1/1/manifest.json
+++ b/chrome/test/data/extensions/good/extension1/1/manifest.json
@@ -1,17 +1,17 @@
-{

-  "format_version": 1,

-  "id": "00123456789ABCDEF0123456789ABCDEF0123456",

-  "version": "1.0.0.0",

-  "name": "My extension 1",

-  "description": "The first extension that I made.",

-  "content_scripts": [

-    {

-      "matches": ["http://*.google.com/*", "https://*.google.com/*"],

-      "js": ["script1.js"]

-    },

-    {

-      "matches": ["http://*.yahoo.com/*"],

-      "js": ["script2.js"]

-    }

-  ]

-}

+{
+  "format_version": 1,
+  "id": "00123456789ABCDEF0123456789ABCDEF0123456",
+  "version": "1.0.0.0",
+  "name": "My extension 1",
+  "description": "The first extension that I made.",
+  "content_scripts": [
+    {
+      "matches": ["http://*.google.com/*", "https://*.google.com/*"],
+      "js": ["script1.js"]
+    },
+    {
+      "matches": ["http://*.yahoo.com/*"],
+      "js": ["script2.js"]
+    }
+  ]
+}
diff --git a/chrome/test/data/extensions/good/extension2/2/manifest.json b/chrome/test/data/extensions/good/extension2/2/manifest.json
index 5e1fb5a..d5bb394 100644
--- a/chrome/test/data/extensions/good/extension2/2/manifest.json
+++ b/chrome/test/data/extensions/good/extension2/2/manifest.json
@@ -1,7 +1,7 @@
-{

-  "format_version": 1,

-  "id": "10123456789ABCDEF0123456789ABCDEF0123456",

-  "version": "1.0.0.0",

-  "name": "My extension 2",

-  "plugins_dir": "npapi"

-}

+{
+  "format_version": 1,
+  "id": "10123456789ABCDEF0123456789ABCDEF0123456",
+  "version": "1.0.0.0",
+  "name": "My extension 2",
+  "plugins_dir": "npapi"
+}
diff --git a/chrome/test/data/pref_service/overlay.json b/chrome/test/data/pref_service/overlay.json
index ea4d831..11c0293 100644
--- a/chrome/test/data/pref_service/overlay.json
+++ b/chrome/test/data/pref_service/overlay.json
@@ -1,22 +1,22 @@
-{

-   "both": {

-      "bool": false,

-      "dictionary": {

-         "value": "persistent"

-      },

-      "int": 1,

-      "list": [ "persistent" ],

-      "real": 1,

-      "string": "persistent"

-   },

-   "persistent": {

-      "bool": false,

-      "dictionary": {

-         "value": "persistent"

-      },

-      "int": 1,

-      "list": [ "persistent" ],

-      "real": 1.0,

-      "string": "persistent"

-   }

-}

+{
+   "both": {
+      "bool": false,
+      "dictionary": {
+         "value": "persistent"
+      },
+      "int": 1,
+      "list": [ "persistent" ],
+      "real": 1,
+      "string": "persistent"
+   },
+   "persistent": {
+      "bool": false,
+      "dictionary": {
+         "value": "persistent"
+      },
+      "int": 1,
+      "list": [ "persistent" ],
+      "real": 1.0,
+      "string": "persistent"
+   }
+}
diff --git a/chrome/test/data/safe_browsing/download_update.py b/chrome/test/data/safe_browsing/download_update.py
index ff504f8..bef5c6d 100755
--- a/chrome/test/data/safe_browsing/download_update.py
+++ b/chrome/test/data/safe_browsing/download_update.py
@@ -29,7 +29,7 @@ for line in response_file:
   filename = chunk_url[chunk_url.rfind('/') + 1:]
   filename =  "%03d" % counter + filename[0:filename.rfind('_')]
   counter += 1
-  
+
   urllib.urlretrieve(chunk_url, filename)
 
 response_file.close()
diff --git a/chrome/test/debugger/debugger_unittests.py b/chrome/test/debugger/debugger_unittests.py
index 8384fb0..19db317 100755
--- a/chrome/test/debugger/debugger_unittests.py
+++ b/chrome/test/debugger/debugger_unittests.py
@@ -39,7 +39,7 @@ def RunTests(build_dir=None):
          os.path.join(chrome_dir, "test", "debugger", "mjsunit.js"),
          os.path.join(chrome_dir, "test", "debugger", "test_protocol.js")
         ]
-  (retcode, output) = google.process_utils.RunCommandFull(cmd, 
+  (retcode, output) = google.process_utils.RunCommandFull(cmd,
                                                           collect_output=True)
   if "Success" in output:
     return 0
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index aae695b..aec6391 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -143,7 +143,7 @@ Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) {
 
   browser->AddTabWithURL(
       GURL("about:blank"), GURL(), PageTransition::START_PAGE, true, NULL);
-  
+
   // Wait for the page to finish loading.
   ui_test_utils::WaitForNavigation(
       browser->GetSelectedTabContents()->controller());
diff --git a/chrome/test/interactive_ui/npapi_interactive_test.cc b/chrome/test/interactive_ui/npapi_interactive_test.cc
index 4ec2b86..95be3f6 100644
--- a/chrome/test/interactive_ui/npapi_interactive_test.cc
+++ b/chrome/test/interactive_ui/npapi_interactive_test.cc
@@ -41,14 +41,14 @@ const char kTestCompleteCookie[] = "status";
 const char kTestCompleteSuccess[] = "OK";
 const int kShortWaitTimeout = 5 * 1000;
 
-// Tests if a plugin executing a self deleting script in the context of 
+// Tests if a plugin executing a self deleting script in the context of
 // a synchronous mousemove works correctly
 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousMouseMove) {
   if (!UITest::in_process_renderer()) {
     scoped_ptr<TabProxy> tab_proxy(GetActiveTab());
     HWND tab_window = NULL;
     tab_proxy->GetHWND(&tab_window);
-    
+
     EXPECT_TRUE(IsWindow(tab_window));
 
     show_window_ = true;
@@ -59,8 +59,8 @@ TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousMouseMove) {
     POINT cursor_position = {130, 130};
     ClientToScreen(tab_window, &cursor_position);
 
-    double screen_width = ::GetSystemMetrics( SM_CXSCREEN ) - 1; 
-    double screen_height = ::GetSystemMetrics( SM_CYSCREEN ) - 1; 
+    double screen_width = ::GetSystemMetrics( SM_CXSCREEN ) - 1;
+    double screen_height = ::GetSystemMetrics( SM_CYSCREEN ) - 1;
     double location_x =  cursor_position.x * (65535.0f / screen_width);
     double location_y =  cursor_position.y * (65535.0f / screen_height);
 
diff --git a/chrome/test/interactive_ui/view_event_test_base.h b/chrome/test/interactive_ui/view_event_test_base.h
index 42a614b..673657c 100644
--- a/chrome/test/interactive_ui/view_event_test_base.h
+++ b/chrome/test/interactive_ui/view_event_test_base.h
@@ -81,7 +81,7 @@ class ViewEventTestBase : public views::WindowDelegate,
   void Release() {}
 
  protected:
-  // Returns the view that is added to the window. 
+  // Returns the view that is added to the window.
   virtual views::View* CreateContentsView() = 0;
 
   // Called once the message loop is running.
@@ -129,7 +129,7 @@ class ViewEventTestBase : public views::WindowDelegate,
   DISALLOW_COPY_AND_ASSIGN(ViewEventTestBase);
 };
 
-// Convenience macro for defining a ViewEventTestBase. See class description 
+// Convenience macro for defining a ViewEventTestBase. See class description
 // of ViewEventTestBase for details.
 #define VIEW_TEST(test_class, name) \
   TEST_F(test_class, name) {\
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 0faaf8e..07e764a 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -193,7 +193,7 @@ class ActiveXTest : public PluginTest {
         L"\\activex_test_control.dll";
     HMODULE h = LoadLibrary(test_control_path.c_str());
     ASSERT_TRUE(h != NULL) << "Failed to load activex_test_control.dll";
-    const char* func_name = register_server ? 
+    const char* func_name = register_server ?
                                 "DllRegisterServer" : "DllUnregisterServer";
     DllRegUnregServerFunc func = reinterpret_cast<DllRegUnregServerFunc>(
         GetProcAddress(h, func_name));
diff --git a/chrome/test/test_location_bar.h b/chrome/test/test_location_bar.h
index 6f9b2ab..d81eb4a 100644
--- a/chrome/test/test_location_bar.h
+++ b/chrome/test/test_location_bar.h
@@ -39,7 +39,7 @@ class TestLocationBar : public LocationBar {
   virtual void SaveStateToContents(TabContents* contents) {}
 
  private:
-  
+
   // Test-supplied values that will be returned through the LocationBar
   // interface.
   std::wstring input_string_;
diff --git a/chrome/test/ui/npapi_test_helper.cc b/chrome/test/ui/npapi_test_helper.cc
index 83e3c5b..c6753d0 100644
--- a/chrome/test/ui/npapi_test_helper.cc
+++ b/chrome/test/ui/npapi_test_helper.cc
@@ -31,7 +31,7 @@
 
 #include "chrome/test/ui/npapi_test_helper.h"
 
-NPAPITester::NPAPITester() 
+NPAPITester::NPAPITester()
     : UITest() {
 }
 
@@ -41,7 +41,7 @@ void NPAPITester::SetUp() {
   std::wstring plugins_directory = browser_directory_ + L"\\plugins";
   std::wstring plugin_src = browser_directory_ + L"\\npapi_test_plugin.dll";
   plugin_dll_ = plugins_directory + L"\\npapi_test_plugin.dll";
-  
+
   CreateDirectory(plugins_directory.c_str(), NULL);
   CopyFile(plugin_src.c_str(), plugin_dll_.c_str(), FALSE);
 
diff --git a/chrome/test/ui/npapi_uitest.cpp b/chrome/test/ui/npapi_uitest.cpp
index d8dbdff..8d808be 100644
--- a/chrome/test/ui/npapi_uitest.cpp
+++ b/chrome/test/ui/npapi_uitest.cpp
@@ -72,7 +72,7 @@ TEST_F(NPAPITester, Arguments) {
   std::wstring test_case = L"arguments.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
-  WaitForFinish("arguments", "1", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
@@ -83,35 +83,35 @@ TEST_F(NPAPITester, ManyPlugins) {
   GURL url(GetTestUrl(L"npapi", test_case));
   NavigateToURL(url);
 
-  WaitForFinish("arguments", "1", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess,  kShortWaitTimeout);
-  WaitForFinish("arguments", "2", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "2", url, kTestCompleteCookie,
                 kTestCompleteSuccess,  kShortWaitTimeout);
-  WaitForFinish("arguments", "3", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "3", url, kTestCompleteCookie,
                 kTestCompleteSuccess,  kShortWaitTimeout);
-  WaitForFinish("arguments", "4", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "4", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "5", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "5", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "6", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "6", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "7", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "7", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "8", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "8", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "9", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "9", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "10", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "10", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "11", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "11", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "12", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "12", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "13", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "13", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "14", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "14", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
-  WaitForFinish("arguments", "15", url, kTestCompleteCookie, 
+  WaitForFinish("arguments", "15", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
@@ -120,17 +120,17 @@ TEST_F(NPAPITester, GetURL) {
   std::wstring test_case = L"geturl.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
-  WaitForFinish("geturl", "1", url, kTestCompleteCookie, 
+  WaitForFinish("geturl", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
-// Test various calls to GetURL for javascript URLs with 
+// Test various calls to GetURL for javascript URLs with
 // non NULL targets from a plugin.
 TEST_F(NPAPITester, GetJavaScriptURL) {
   std::wstring test_case = L"get_javascript_url.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
-  WaitForFinish("getjavascripturl", "1", url, kTestCompleteCookie, 
+  WaitForFinish("getjavascripturl", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
@@ -142,13 +142,13 @@ TEST_F(NPAPITester, NPObjectProxy) {
   std::wstring test_case = L"npobject_proxy.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
-  WaitForFinish("npobject_proxy", "1", url, kTestCompleteCookie, 
+  WaitForFinish("npobject_proxy", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
 // Tests if a plugin executing a self deleting script using NPN_GetURL
 // works without crashing or hanging
-TEST_F(NPAPITester, SelfDeletePluginGetUrl) { 
+TEST_F(NPAPITester, SelfDeletePluginGetUrl) {
   std::wstring test_case = L"self_delete_plugin_geturl.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
@@ -186,7 +186,7 @@ TEST_F(NPAPITester, DISABLED_SelfDeletePluginInvokeAlert) {
                 kShortWaitTimeout);
 }
 
-// Tests if a plugin executing a self deleting script in the context of 
+// Tests if a plugin executing a self deleting script in the context of
 // a synchronous paint event works correctly
 TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInvokeInSynchronousPaint) {
   if (!UITest::in_process_renderer()) {
@@ -218,7 +218,7 @@ TEST_F(NPAPIVisiblePluginTester, VerifyPluginWindowRect) {
   std::wstring test_case = L"verify_plugin_window_rect.html";
   GURL url = GetTestUrl(L"npapi", test_case);
   NavigateToURL(url);
-  WaitForFinish("checkwindowrect", "1", url, kTestCompleteCookie, 
+  WaitForFinish("checkwindowrect", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
@@ -238,7 +238,7 @@ TEST_F(NPAPIVisiblePluginTester, VerifyNPObjectLifetimeTest) {
 TEST_F(NPAPIVisiblePluginTester, NewFails) {
   GURL url = GetTestUrl(L"npapi", L"new_fails.html");
   NavigateToURL(url);
-  WaitForFinish("new_fails", "1", url, kTestCompleteCookie, 
+  WaitForFinish("new_fails", "1", url, kTestCompleteCookie,
                 kTestCompleteSuccess, kShortWaitTimeout);
 }
 
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index 7471711..af0932b2 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -54,7 +54,7 @@ class NavigationNotificationObserver : public NotificationObserver {
   DISALLOW_COPY_AND_ASSIGN(NavigationNotificationObserver);
 };
 
-}  // namespace 
+}  // namespace
 
 void RunMessageLoop() {
   MessageLoopForUI* loop = MessageLoopForUI::current();